Restructure: Move sample rate conversion from common code to 'libsamplerate'

.gitignore

@@ -20,6 +20,7 @@ compile
 .libs
 .dirstamp
 m4
+src/libsamplerate/libsamplerate.a
 src/libfilter/libfilter.a
 src/common/libcommon.a
 src/common/libmobile.a

configure.ac

@@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
 AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
 
 AC_OUTPUT(
+    src/libsamplerate/Makefile
     src/libfilter/Makefile
     src/common/Makefile
     src/anetz/Makefile

src/Makefile.am

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

src/amps/Makefile.am

@@ -28,6 +28,7 @@ amps_LDADD = \
 	libamps.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/anetz/Makefile.am

@@ -14,6 +14,7 @@ anetz_LDADD = \
 	$(top_builddir)/src/common/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/bnetz/Makefile.am

@@ -16,6 +16,7 @@ bnetz_LDADD = \
 	$(top_builddir)/src/common/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/cnetz/Makefile.am

@@ -20,6 +20,7 @@ cnetz_LDADD = \
 	$(top_builddir)/src/common/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/common/Makefile.am

@@ -11,7 +11,6 @@ libcommon_a_SOURCES = \
 	goertzel.c \
 	jitter.c \
 	dtmf.c \
-	samplerate.c \
 	emphasis.c \
 	compandor.c \
 	fft.c \

src/common/emphasis.h

@@ -1,3 +1,5 @@
+#include "../libfilter/iir_filter.h"
+
 typedef struct emphasis {
 	struct {
 		iir_filter_t lp;

src/common/mncc_console.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include "sample.h"
-#include "samplerate.h"
+#include "../libsamplerate/samplerate.h"
 #include "jitter.h"
 #include "debug.h"
 #include "testton.h"

src/common/sender.h

@@ -3,7 +3,7 @@
 #include "sdr.h"
 #endif
 #include "wave.h"
-#include "samplerate.h"
+#include "../libsamplerate/samplerate.h"
 #include "jitter.h"
 #include "emphasis.h"
 #include "display.h"

src/jtacs/Makefile.am

@@ -14,6 +14,7 @@ jtacs_LDADD = \
 	../amps/libamps.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/libsamplerate/Makefile.am

@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libsamplerate.a
+
+libsamplerate_a_SOURCES = \
+	samplerate.c

src/libsamplerate/samplerate.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include "sample.h"
+#include "../common/sample.h"
 #include "samplerate.h"
 
 int init_samplerate(samplerate_t *state, double low_samplerate, double high_samplerate, double filter_cutoff)

src/nmt/Makefile.am

@@ -24,6 +24,7 @@ nmt_LDADD = \
 	libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/r2000/Makefile.am

@@ -14,6 +14,7 @@ radiocom2000_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/tacs/Makefile.am

@@ -15,6 +15,7 @@ tacs_LDADD = \
 	../amps/libamps.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \

src/test/Makefile.am

@@ -15,6 +15,7 @@ test_filter_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
@@ -38,6 +39,7 @@ test_emphasis_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
@@ -51,6 +53,7 @@ test_dms_LDADD = \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
@@ -64,6 +67,7 @@ test_sms_LDADD = \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \