Restructure: Move emphasis from common code to 'libemphasis'

pull/1/head
Andreas Eversberg 5 years ago
parent 16194c15f9
commit 40c24a70b2
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 2
      src/Makefile.am
  4. 1
      src/amps/Makefile.am
  5. 1
      src/anetz/Makefile.am
  6. 1
      src/bnetz/Makefile.am
  7. 1
      src/cnetz/Makefile.am
  8. 1
      src/common/Makefile.am
  9. 2
      src/common/sender.h
  10. 1
      src/jtacs/Makefile.am
  11. 6
      src/libemphasis/Makefile.am
  12. 4
      src/libemphasis/emphasis.c
  13. 0
      src/libemphasis/emphasis.h
  14. 1
      src/nmt/Makefile.am
  15. 1
      src/r2000/Makefile.am
  16. 1
      src/tacs/Makefile.am
  17. 4
      src/test/Makefile.am
  18. 2
      src/test/test_emphasis.c

1
.gitignore vendored

@ -29,6 +29,7 @@ src/libgermanton/libgermanton.a
src/libtimer/libtimer.a
src/libsamplerate/libsamplerate.a
src/libscrambler/libscrambler.a
src/libemphasis/libemphasis.a
src/libfilter/libfilter.a
src/libwave/libwave.a
src/common/libcommon.a

@ -84,6 +84,7 @@ AC_OUTPUT(
src/libtimer/Makefile
src/libsamplerate/Makefile
src/libscrambler/Makefile
src/libemphasis/Makefile
src/libfilter/Makefile
src/libwave/Makefile
src/common/Makefile

@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libemphasis libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test

@ -32,6 +32,7 @@ amps_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -19,6 +19,7 @@ anetz_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -20,6 +20,7 @@ bnetz_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -23,6 +23,7 @@ cnetz_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libscrambler/libscrambler.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -6,7 +6,6 @@ libcommon_a_SOURCES = \
sample.c \
debug.c \
sound_alsa.c \
emphasis.c \
compandor.c \
fft.c \
fm_modulation.c \

@ -5,7 +5,7 @@
#include "../libwave/wave.h"
#include "../libsamplerate/samplerate.h"
#include "../libjitter/jitter.h"
#include "emphasis.h"
#include "../libemphasis/emphasis.h"
#include "display.h"
#define MAX_SENDER 16

@ -18,6 +18,7 @@ jtacs_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -0,0 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libemphasis.a
libemphasis_a_SOURCES = \
emphasis.c

@ -21,10 +21,10 @@
#include <stdint.h>
#include <string.h>
#include <math.h>
#include "sample.h"
#include "../common/sample.h"
#include "../common/debug.h"
#include "../libfilter/iir_filter.h"
#include "emphasis.h"
#include "debug.h"
#define PI M_PI

@ -30,6 +30,7 @@ nmt_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -18,6 +18,7 @@ radiocom2000_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -19,6 +19,7 @@ tacs_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -18,6 +18,7 @@ test_filter_LDADD = \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \
@ -45,6 +46,7 @@ test_emphasis_LDADD = \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \
@ -62,6 +64,7 @@ test_dms_LDADD = \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \
@ -79,6 +82,7 @@ test_sms_LDADD = \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(ALSA_LIBS) \

@ -4,7 +4,7 @@
#include <string.h>
#include "../common/sample.h"
#include "../libfilter/iir_filter.h"
#include "../common/emphasis.h"
#include "../libemphasis/emphasis.h"
#include "../common/debug.h"
#define level2db(level) (20 * log10(level))

Loading…
Cancel
Save