aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/amps/Makefile.am1
-rw-r--r--src/anetz/Makefile.am1
-rw-r--r--src/bnetz/Makefile.am1
-rw-r--r--src/cnetz/Makefile.am1
-rw-r--r--src/common/Makefile.am1
-rw-r--r--src/common/sender.h2
-rw-r--r--src/jtacs/Makefile.am1
-rw-r--r--src/libwave/Makefile.am6
-rw-r--r--src/libwave/wave.c (renamed from src/common/wave.c)2
-rw-r--r--src/libwave/wave.h (renamed from src/common/wave.h)0
-rw-r--r--src/nmt/Makefile.am1
-rw-r--r--src/r2000/Makefile.am1
-rw-r--r--src/tacs/Makefile.am1
-rw-r--r--src/test/Makefile.am4
-rw-r--r--src/tv/Makefile.am1
-rw-r--r--src/tv/main.c2
19 files changed, 25 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index f9fe084..6a78789 100644
--- a/.gitignore
+++ b/.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
diff --git a/configure.ac b/configure.ac
index 006acc0..d59d068 100644
--- a/configure.ac
+++ b/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
diff --git a/src/Makefile.am b/src/Makefile.am
index 187ab9d..c4670e3 100644
--- a/src/Makefile.am
+++ b/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
diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am
index f37c5ff..c090792 100644
--- a/src/amps/Makefile.am
+++ b/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) \
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index fcec1fc..3df8889 100644
--- a/src/anetz/Makefile.am
+++ b/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) \
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index 505a915..c9f3978 100644
--- a/src/bnetz/Makefile.am
+++ b/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) \
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index 0550625..39439e6 100644
--- a/src/cnetz/Makefile.am
+++ b/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) \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 35b1e5f..ba74b61 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 \
- wave.c \
goertzel.c \
jitter.c \
emphasis.c \
diff --git a/src/common/sender.h b/src/common/sender.h
index c222fda..4da32cd 100644
--- a/src/common/sender.h
+++ b/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"
diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am
index 651d2b9..cc17138 100644
--- a/src/jtacs/Makefile.am
+++ b/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) \
diff --git a/src/libwave/Makefile.am b/src/libwave/Makefile.am
new file mode 100644
index 0000000..c573515
--- /dev/null
+++ b/src/libwave/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libwave.a
+
+libwave_a_SOURCES = \
+ wave.c
diff --git a/src/common/wave.c b/src/libwave/wave.c
index feae254..a358068 100644
--- a/src/common/wave.c
+++ b/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 */
diff --git a/src/common/wave.h b/src/libwave/wave.h
index b7dc34a..b7dc34a 100644
--- a/src/common/wave.h
+++ b/src/libwave/wave.h
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index ddaabd9..041d9b3 100644
--- a/src/nmt/Makefile.am
+++ b/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) \
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index a5e1585..8352e9f 100644
--- a/src/r2000/Makefile.am
+++ b/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) \
diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am
index 1b392d3..2221706 100644
--- a/src/tacs/Makefile.am
+++ b/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) \
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 37632cf..38bb717 100644
--- a/src/test/Makefile.am
+++ b/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) \
diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am
index 1b984d8..b4c068d 100644
--- a/src/tv/Makefile.am
+++ b/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) \
diff --git a/src/tv/main.c b/src/tv/main.c
index 115d97d..7440d0b 100644
--- a/src/tv/main.c
+++ b/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