Restructure: Move wave from common code to 'libwave'

.gitignore

@@ -26,6 +26,7 @@ src/libtimer/libtimer.a
 src/libsamplerate/libsamplerate.a
 src/libscrambler/libscrambler.a
 src/libfilter/libfilter.a
+src/libwave/libwave.a
 src/common/libcommon.a
 src/common/libmobile.a
 src/common/libimage.a

configure.ac

@@ -81,6 +81,7 @@ AC_OUTPUT(
     src/libsamplerate/Makefile
     src/libscrambler/Makefile
     src/libfilter/Makefile
+    src/libwave/Makefile
     src/common/Makefile
     src/anetz/Makefile
     src/bnetz/Makefile

src/Makefile.am

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

src/amps/Makefile.am

@@ -31,6 +31,7 @@ amps_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/anetz/Makefile.am

@@ -17,6 +17,7 @@ anetz_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/bnetz/Makefile.am

@@ -19,6 +19,7 @@ bnetz_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/cnetz/Makefile.am

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

src/common/Makefile.am

@@ -6,7 +6,6 @@ libcommon_a_SOURCES = \
 	sample.c \
 	debug.c \
 	sound_alsa.c \
-	wave.c \
 	goertzel.c \
 	jitter.c \
 	emphasis.c \

src/common/sender.h

@@ -2,7 +2,7 @@
 #ifdef HAVE_SDR
 #include "sdr.h"
 #endif
-#include "wave.h"
+#include "../libwave/wave.h"
 #include "../libsamplerate/samplerate.h"
 #include "jitter.h"
 #include "emphasis.h"

src/jtacs/Makefile.am

@@ -17,6 +17,7 @@ jtacs_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/libwave/Makefile.am

@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libwave.a
+
+libwave_a_SOURCES = \
+	wave.c

src/libwave/wave.c

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pthread.h>
-#include "sample.h"
+#include "../common/sample.h"
 #include "wave.h"
 
 /* NOTE: No locking required for writing and reading buffer pointers, since 'int' is atomic on >=32 bit machines */

src/nmt/Makefile.am

@@ -28,6 +28,7 @@ nmt_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/r2000/Makefile.am

@@ -17,6 +17,7 @@ radiocom2000_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/tacs/Makefile.am

@@ -18,6 +18,7 @@ tacs_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/test/Makefile.am

@@ -18,6 +18,7 @@ test_filter_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -43,6 +44,7 @@ test_emphasis_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -58,6 +60,7 @@ test_dms_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -73,6 +76,7 @@ test_sms_LDADD = \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/tv/Makefile.am

@@ -18,6 +18,7 @@ osmotv_LDADD = \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/tv/main.c

@@ -30,7 +30,7 @@ enum paging_signal;
 #include "../common/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../common/fm_modulation.h"
-#include "../common/wave.h"
+#include "../libwave/wave.h"
 #include "../common/img.h"
 #include "../common/debug.h"
 #ifdef HAVE_SDR