Restructure: Move emphasis from common code to 'libemphasis'

18 files changed, 25 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index bc50bf0..3e174b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/configure.ac b/configure.ac
index 18d8f86..ddaaa7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d081bc..faac7c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
 
diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am
index 9734b8d..756cea9 100644
--- a/src/amps/Makefile.am
+++ b/src/amps/Makefile.am
@@ -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) \
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index 98c13f2..a2f2857 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -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) \
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index dfcc7f8..5230529 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -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) \
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index 8ab18f6..d1a3b20 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -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) \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 02bdf9f..56b4c84 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -6,7 +6,6 @@ libcommon_a_SOURCES = \
 	sample.c \
 	debug.c \
 	sound_alsa.c \
-	emphasis.c \
 	compandor.c \
 	fft.c \
 	fm_modulation.c \
diff --git a/src/common/sender.h b/src/common/sender.h
index 6ec6ad8..09fab06 100644
--- a/src/common/sender.h
+++ b/src/common/sender.h
@@ -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
diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am
index d5abc41..c53ac0c 100644
--- a/src/jtacs/Makefile.am
+++ b/src/jtacs/Makefile.am
@@ -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) \
diff --git a/src/libemphasis/Makefile.am b/src/libemphasis/Makefile.am
new file mode 100644
index 0000000..62599a6
--- /dev/null
+++ b/src/libemphasis/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libemphasis.a
+
+libemphasis_a_SOURCES = \
+	emphasis.c
diff --git a/src/common/emphasis.c b/src/libemphasis/emphasis.c
index 08f944a..e4ee95b 100644
--- a/src/common/emphasis.c
+++ b/src/libemphasis/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
 
diff --git a/src/common/emphasis.h b/src/libemphasis/emphasis.h
index 43d54e6..43d54e6 100644
--- a/src/common/emphasis.h
+++ b/src/libemphasis/emphasis.h
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index 6edcc0e..6f61e79 100644
--- a/src/nmt/Makefile.am
+++ b/src/nmt/Makefile.am
@@ -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) \
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index eacd6cb..fe0c2f9 100644
--- a/src/r2000/Makefile.am
+++ b/src/r2000/Makefile.am
@@ -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) \
diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am
index 6c6b0eb..f36371b 100644
--- a/src/tacs/Makefile.am
+++ b/src/tacs/Makefile.am
@@ -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) \
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 7e5ce3e..c2c445e 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -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) \
diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c
index b02c106..1add085 100644
--- a/src/test/test_emphasis.c
+++ b/src/test/test_emphasis.c
@@ -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))