Restructure: Move sample from common code to 'libsample'

.gitignore

@@ -39,6 +39,7 @@ src/libfft/libfft.a
 src/libmncc/libmncc.a
 src/libsound/libsound.a
 src/libsdr/libsdr.a
+src/libsample/libsample.a
 src/common/libcommon.a
 src/common/libmobile.a
 src/anetz/libgermanton.a

configure.ac

@@ -94,6 +94,7 @@ AC_OUTPUT(
     src/libmncc/Makefile
     src/libsound/Makefile
     src/libsdr/Makefile
+    src/libsample/Makefile
     src/common/Makefile
     src/anetz/Makefile
     src/bnetz/Makefile

src/Makefile.am

@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = \
+	libsample \
 	libimage \
 	libcompandor \
 	libgoertzel \

src/amps/Makefile.am

@@ -38,6 +38,7 @@ amps_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/amps/amps.c

@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../libmncc/cause.h"

src/amps/amps_tacs_main.c

@@ -22,7 +22,7 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
 #include "../common/call.h"

src/amps/dsp.c

@@ -81,7 +81,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "amps.h"

src/amps/frame.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <math.h>
 #include <inttypes.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "amps.h"
 #include "dsp.h"

src/amps/sysinfo.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "amps.h"
 #include "frame.h"
 #include "main.h"

src/amps/transaction.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../libmncc/cause.h"

src/anetz/Makefile.am

@@ -30,6 +30,7 @@ anetz_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/anetz/anetz.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../libtimer/timer.h"
 #include "../common/call.h"

src/anetz/dsp.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../libtimer/timer.h"
 #include "../common/call.h"

src/anetz/main.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
 #include "../libtimer/timer.h"

src/bnetz/Makefile.am

@@ -26,6 +26,7 @@ bnetz_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/bnetz/bnetz.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../libmncc/cause.h"

src/bnetz/dsp.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "bnetz.h"

src/bnetz/main.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../common/main_mobile.h"

src/cnetz/Makefile.am

@@ -29,6 +29,7 @@ cnetz_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/cnetz/cnetz.c

@@ -142,7 +142,7 @@
 #include <errno.h>
 #include <math.h>
 #include <inttypes.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../libmncc/cause.h"

src/cnetz/database.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "cnetz.h"
 #include "database.h"

src/cnetz/dsp.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <math.h>
 #include <errno.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "cnetz.h"

src/cnetz/fsk_demod.c

@@ -128,7 +128,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "cnetz.h"
 #include "dsp.h"

src/cnetz/main.c

@@ -22,7 +22,7 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
 #include "../common/call.h"

src/cnetz/telegramm.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "cnetz.h"
 #include "dsp.h"

src/cnetz/transaction.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../libmncc/cause.h"

src/common/Makefile.am

@@ -3,7 +3,6 @@ AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
 noinst_LIBRARIES = libcommon.a libmobile.a
 
 libcommon_a_SOURCES = \
-	sample.c \
 	debug.c \
 	display_wave.c \
 	display_measurements.c

src/common/call.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "debug.h"
 #include "sender.h"
 #include "call.h"

src/common/debug.c

@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <math.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "debug.h"
 #include "display.h"
 #include "../libmncc/mncc_console.h"

src/common/display_measurements.c

@@ -24,7 +24,7 @@
 #include <pthread.h>
 #include <sys/ioctl.h>
 #include <math.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "sender.h"
 
 #define MAX_NAME_LEN	16

src/common/display_status.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <sys/ioctl.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "sender.h"
 
 static int status_on = 0;

src/common/display_wave.c

@@ -23,7 +23,7 @@
 #include <pthread.h>
 #include <math.h>
 #include <sys/ioctl.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "sender.h"
 
 #define HEIGHT	11

src/common/main_mobile.c

@@ -29,7 +29,7 @@
 #include <termios.h>
 #include <errno.h>
 #include <getopt.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "main_mobile.h"
 #include "debug.h"
 #include "sender.h"

src/common/sender.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include "sample.h"
+#include "../libsample/sample.h"
 #include "debug.h"
 #include "sender.h"
 #include "../libtimer/timer.h"

src/jtacs/Makefile.am

@@ -24,6 +24,7 @@ jtacs_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/libcompandor/compandor.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "compandor.h"
 
 //#define db2level(db)			pow(10, (double)db / 20.0)

src/libdtmf/dtmf_encode.c

@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "dtmf_encode.h"
 
 #define PI		M_PI

src/libemphasis/emphasis.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../libfilter/iir_filter.h"
 #include "emphasis.h"

src/libfilter/iir_filter.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "iir_filter.h"
 
 #define PI M_PI

src/libfm/fm.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "fm.h"
 
 //#define FAST_SINE

src/libfsk/fsk.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "fsk.h"
 

src/libgoertzel/goertzel.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "goertzel.h"
 

src/libjitter/jitter.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "jitter.h"
 

src/libmncc/mncc_console.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libsamplerate/samplerate.h"
 #include "../libjitter/jitter.h"
 #include "../common/debug.h"

src/libmncc/mncc_cross.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "cause.h"

src/libmncc/mncc_sock.c

@@ -26,7 +26,7 @@
 #include <sys/un.h>
 #include <stddef.h>
 #include <unistd.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "cause.h"

src/libsample/Makefile.am

@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libsample.a
+
+libsample_a_SOURCES = \
+	sample.c

src/libsamplerate/samplerate.c

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

src/libscrambler/scrambler.c

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "scrambler.h"
 
 #define PI		M_PI

src/libsdr/display_iq.c

@@ -23,7 +23,7 @@
 #include <math.h>
 #include <pthread.h>
 #include <stdlib.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/sender.h"
 
 /* must be odd value! */

src/libsdr/display_spectrum.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/sender.h"
 #include "../libfft/fft.h"
 

src/libsdr/sdr.c

@@ -29,7 +29,7 @@ enum paging_signal;
 #define __USE_GNU
 #include <pthread.h>
 #include <unistd.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libfm/fm.h"
 #include "../libtimer/timer.h"
 #include "../common/sender.h"

src/libsdr/sdr_config.c

@@ -24,7 +24,7 @@ enum paging_signal;
 #include <string.h>
 #include <stdint.h>
 #include <getopt.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "sdr.h"
 #include "sdr_config.h"
 

src/libsound/sound_alsa.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <math.h>
 #include <alsa/asoundlib.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../common/sender.h"
 

src/libwave/wave.c

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pthread.h>
-#include "../common/sample.h"
+#include "../libsample/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

@@ -38,6 +38,7 @@ nmt_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/nmt/dms.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "nmt.h"
 

src/nmt/dsp.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "nmt.h"
 #include "transaction.h"

src/nmt/frame.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../libhagelbarger/hagelbarger.h"
 #include "nmt.h"

src/nmt/main.c

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
 #include "nmt.h"

src/nmt/nmt.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <time.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../libmncc/cause.h"
 #include "nmt.h"

src/nmt/sms.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <time.h>
 #include <errno.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "nmt.h"
 

src/nmt/transaction.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "nmt.h"
 #include "transaction.h"

src/r2000/Makefile.am

@@ -26,6 +26,7 @@ radiocom2000_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/r2000/dsp.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "r2000.h"
 #include "dsp.h"

src/r2000/main.c

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/main_mobile.h"
 #include "../common/debug.h"
 #include "r2000.h"

src/r2000/r2000.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <time.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../libmncc/cause.h"
 #include "r2000.h"

src/tacs/Makefile.am

@@ -25,6 +25,7 @@ tacs_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/test/Makefile.am

@@ -23,6 +23,7 @@ test_filter_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -61,6 +62,7 @@ test_emphasis_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -88,6 +90,7 @@ test_dms_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -115,6 +118,7 @@ test_sms_LDADD = \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libmncc/libmncc.a \
 	$(top_builddir)/src/libsound/libsound.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/test/test_compandor.c

@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <math.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libcompandor/compandor.h"
 
 #define level2db(level)		(20 * log10(level))

src/test/test_dms.c

@@ -4,7 +4,7 @@
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../nmt/nmt.h"
 

src/test/test_emphasis.c

@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <math.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libemphasis/emphasis.h"
 #include "../common/debug.h"

src/test/test_filter.c

@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <math.h>
 #include <string.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../common/debug.h"
 

src/test/test_performance.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <string.h>
 #include <sys/time.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libfm/fm.h"
 #include "../common/debug.h"

src/test/test_sms.c

@@ -4,7 +4,7 @@
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../common/debug.h"
 #include "../nmt/nmt.h"
 

src/tv/Makefile.am

@@ -19,6 +19,7 @@ osmotv_LDADD = \
 	$(top_builddir)/src/libfm/libfm.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/libwave/libwave.a \
+	$(top_builddir)/src/libsample/libsample.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/tv/bas.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "bas.h"
 #include "vcr.h"

src/tv/fubk.c

@@ -20,7 +20,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "fubk.h"
 #include "font.h"
 

src/tv/image.c

@@ -19,7 +19,7 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "image.h"
 
 /* render image line starting with x and end with LINE_LENGTH

src/tv/main.c

@@ -27,7 +27,7 @@ enum paging_signal;
 #include <getopt.h>
 #include <signal.h>
 #include <math.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libfm/fm.h"
 #include "../libwave/wave.h"

src/tv/tv_modulate.c

@@ -19,7 +19,7 @@
 
 #include <math.h>
 #include <stdint.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "tv_modulate.h"
 
 #define WHITE_MODULATION	0.1

src/tv/vcr.c

@@ -20,7 +20,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include "../common/sample.h"
+#include "../libsample/sample.h"
 #include "vcr.h"
 
 /* test ID of calibration part: