From ed31a26ebabcd28678aff679093b6e6fba55b67f Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sat, 18 Nov 2017 08:06:06 +0100 Subject: [PATCH] Restructure: Move sample from common code to 'libsample' --- .gitignore | 1 + configure.ac | 1 + src/Makefile.am | 1 + src/amps/Makefile.am | 1 + src/amps/amps.c | 2 +- src/amps/amps_tacs_main.c | 2 +- src/amps/dsp.c | 2 +- src/amps/frame.c | 2 +- src/amps/sysinfo.c | 2 +- src/amps/transaction.c | 2 +- src/anetz/Makefile.am | 1 + src/anetz/anetz.c | 2 +- src/anetz/dsp.c | 2 +- src/anetz/main.c | 2 +- src/bnetz/Makefile.am | 1 + src/bnetz/bnetz.c | 2 +- src/bnetz/dsp.c | 2 +- src/bnetz/main.c | 2 +- src/cnetz/Makefile.am | 1 + src/cnetz/cnetz.c | 2 +- src/cnetz/database.c | 2 +- src/cnetz/dsp.c | 2 +- src/cnetz/fsk_demod.c | 2 +- src/cnetz/main.c | 2 +- src/cnetz/telegramm.c | 2 +- src/cnetz/transaction.c | 2 +- src/common/Makefile.am | 1 - src/common/call.c | 2 +- src/common/debug.c | 2 +- src/common/display_measurements.c | 2 +- src/common/display_status.c | 2 +- src/common/display_wave.c | 2 +- src/common/main_mobile.c | 2 +- src/common/sender.c | 2 +- src/jtacs/Makefile.am | 1 + src/libcompandor/compandor.c | 2 +- src/libdtmf/dtmf_encode.c | 2 +- src/libemphasis/emphasis.c | 2 +- src/libfilter/iir_filter.c | 2 +- src/libfm/fm.c | 2 +- src/libfsk/fsk.c | 2 +- src/libgoertzel/goertzel.c | 2 +- src/libjitter/jitter.c | 2 +- src/libmncc/mncc_console.c | 2 +- src/libmncc/mncc_cross.c | 2 +- src/libmncc/mncc_sock.c | 2 +- src/libsample/Makefile.am | 6 ++++++ src/{common => libsample}/sample.c | 0 src/{common => libsample}/sample.h | 0 src/libsamplerate/samplerate.c | 2 +- src/libscrambler/scrambler.c | 2 +- src/libsdr/display_iq.c | 2 +- src/libsdr/display_spectrum.c | 2 +- src/libsdr/sdr.c | 2 +- src/libsdr/sdr_config.c | 2 +- src/libsound/sound_alsa.c | 2 +- src/libwave/wave.c | 2 +- src/nmt/Makefile.am | 1 + src/nmt/dms.c | 2 +- src/nmt/dsp.c | 2 +- src/nmt/frame.c | 2 +- src/nmt/main.c | 2 +- src/nmt/nmt.c | 2 +- src/nmt/sms.c | 2 +- src/nmt/transaction.c | 2 +- src/r2000/Makefile.am | 1 + src/r2000/dsp.c | 2 +- src/r2000/main.c | 2 +- src/r2000/r2000.c | 2 +- src/tacs/Makefile.am | 1 + src/test/Makefile.am | 4 ++++ src/test/test_compandor.c | 2 +- src/test/test_dms.c | 2 +- src/test/test_emphasis.c | 2 +- src/test/test_filter.c | 2 +- src/test/test_performance.c | 2 +- src/test/test_sms.c | 2 +- src/tv/Makefile.am | 1 + src/tv/bas.c | 2 +- src/tv/fubk.c | 2 +- src/tv/image.c | 2 +- src/tv/main.c | 2 +- src/tv/tv_modulate.c | 2 +- src/tv/vcr.c | 2 +- 84 files changed, 89 insertions(+), 68 deletions(-) create mode 100644 src/libsample/Makefile.am rename src/{common => libsample}/sample.c (100%) rename src/{common => libsample}/sample.h (100%) diff --git a/.gitignore b/.gitignore index 88eaa4fa..1ddc7938 100644 --- a/.gitignore +++ b/.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 diff --git a/configure.ac b/configure.ac index 515a8743..2cd920b3 100644 --- a/configure.ac +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 17f45651..ff58c84a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = \ + libsample \ libimage \ libcompandor \ libgoertzel \ diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am index 1f384d57..88da1cb9 100644 --- a/src/amps/Makefile.am +++ b/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) \ diff --git a/src/amps/amps.c b/src/amps/amps.c index a103b024..de9cac2b 100644 --- a/src/amps/amps.c +++ b/src/amps/amps.c @@ -42,7 +42,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "../libmncc/cause.h" diff --git a/src/amps/amps_tacs_main.c b/src/amps/amps_tacs_main.c index 4d3a77d4..dbb99738 100644 --- a/src/amps/amps_tacs_main.c +++ b/src/amps/amps_tacs_main.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/main_mobile.h" #include "../common/debug.h" #include "../common/call.h" diff --git a/src/amps/dsp.c b/src/amps/dsp.c index 479daea7..ae71432c 100644 --- a/src/amps/dsp.c +++ b/src/amps/dsp.c @@ -81,7 +81,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "amps.h" diff --git a/src/amps/frame.c b/src/amps/frame.c index efaf4cfe..52ee8632 100644 --- a/src/amps/frame.c +++ b/src/amps/frame.c @@ -26,7 +26,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "amps.h" #include "dsp.h" diff --git a/src/amps/sysinfo.c b/src/amps/sysinfo.c index 767ea133..974f35e2 100644 --- a/src/amps/sysinfo.c +++ b/src/amps/sysinfo.c @@ -3,7 +3,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "amps.h" #include "frame.h" #include "main.h" diff --git a/src/amps/transaction.c b/src/amps/transaction.c index d3d07814..edad0a3d 100644 --- a/src/amps/transaction.c +++ b/src/amps/transaction.c @@ -20,7 +20,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "../libmncc/cause.h" diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am index 9ff905e5..fb927543 100644 --- a/src/anetz/Makefile.am +++ b/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) \ diff --git a/src/anetz/anetz.c b/src/anetz/anetz.c index 109c053e..077d6737 100644 --- a/src/anetz/anetz.c +++ b/src/anetz/anetz.c @@ -24,7 +24,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../libtimer/timer.h" #include "../common/call.h" diff --git a/src/anetz/dsp.c b/src/anetz/dsp.c index bb08bdc1..ec971fc5 100644 --- a/src/anetz/dsp.c +++ b/src/anetz/dsp.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../libtimer/timer.h" #include "../common/call.h" diff --git a/src/anetz/main.c b/src/anetz/main.c index d6982455..382ccc43 100644 --- a/src/anetz/main.c +++ b/src/anetz/main.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/main_mobile.h" #include "../common/debug.h" #include "../libtimer/timer.h" diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index 922e8fb6..5a98339d 100644 --- a/src/bnetz/Makefile.am +++ b/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) \ diff --git a/src/bnetz/bnetz.c b/src/bnetz/bnetz.c index 1d3d6085..cd78db01 100644 --- a/src/bnetz/bnetz.c +++ b/src/bnetz/bnetz.c @@ -24,7 +24,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "../libmncc/cause.h" diff --git a/src/bnetz/dsp.c b/src/bnetz/dsp.c index e61972d0..01326ef2 100644 --- a/src/bnetz/dsp.c +++ b/src/bnetz/dsp.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "bnetz.h" diff --git a/src/bnetz/main.c b/src/bnetz/main.c index 9b48f98b..014165b1 100644 --- a/src/bnetz/main.c +++ b/src/bnetz/main.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "../common/main_mobile.h" diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am index 95b83d41..6c1164eb 100644 --- a/src/cnetz/Makefile.am +++ b/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) \ diff --git a/src/cnetz/cnetz.c b/src/cnetz/cnetz.c index d708827c..d8a9ccf9 100644 --- a/src/cnetz/cnetz.c +++ b/src/cnetz/cnetz.c @@ -142,7 +142,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "../libmncc/cause.h" diff --git a/src/cnetz/database.c b/src/cnetz/database.c index c8d6b645..b7465e9f 100644 --- a/src/cnetz/database.c +++ b/src/cnetz/database.c @@ -21,7 +21,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "cnetz.h" #include "database.h" diff --git a/src/cnetz/dsp.c b/src/cnetz/dsp.c index 07a5117f..cba0de97 100644 --- a/src/cnetz/dsp.c +++ b/src/cnetz/dsp.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "cnetz.h" diff --git a/src/cnetz/fsk_demod.c b/src/cnetz/fsk_demod.c index 87339304..2f0ae962 100644 --- a/src/cnetz/fsk_demod.c +++ b/src/cnetz/fsk_demod.c @@ -128,7 +128,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "cnetz.h" #include "dsp.h" diff --git a/src/cnetz/main.c b/src/cnetz/main.c index 0a458de6..3285fee7 100644 --- a/src/cnetz/main.c +++ b/src/cnetz/main.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/main_mobile.h" #include "../common/debug.h" #include "../common/call.h" diff --git a/src/cnetz/telegramm.c b/src/cnetz/telegramm.c index 48c0e834..5e67622a 100644 --- a/src/cnetz/telegramm.c +++ b/src/cnetz/telegramm.c @@ -26,7 +26,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "cnetz.h" #include "dsp.h" diff --git a/src/cnetz/transaction.c b/src/cnetz/transaction.c index 1c30c54b..724fe9ed 100644 --- a/src/cnetz/transaction.c +++ b/src/cnetz/transaction.c @@ -20,7 +20,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "../libmncc/cause.h" diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 9abad045..8380053f 100644 --- a/src/common/Makefile.am +++ b/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 diff --git a/src/common/call.c b/src/common/call.c index 87a6683b..85c0e9fd 100644 --- a/src/common/call.c +++ b/src/common/call.c @@ -24,7 +24,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "debug.h" #include "sender.h" #include "call.h" diff --git a/src/common/debug.c b/src/common/debug.c index f03a6d38..4b41a3ed 100644 --- a/src/common/debug.c +++ b/src/common/debug.c @@ -24,7 +24,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "debug.h" #include "display.h" #include "../libmncc/mncc_console.h" diff --git a/src/common/display_measurements.c b/src/common/display_measurements.c index 028224a4..07ee5a70 100644 --- a/src/common/display_measurements.c +++ b/src/common/display_measurements.c @@ -24,7 +24,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "sender.h" #define MAX_NAME_LEN 16 diff --git a/src/common/display_status.c b/src/common/display_status.c index 66ff9acb..961f294b 100644 --- a/src/common/display_status.c +++ b/src/common/display_status.c @@ -22,7 +22,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "sender.h" static int status_on = 0; diff --git a/src/common/display_wave.c b/src/common/display_wave.c index 1d729b2a..b88080b2 100644 --- a/src/common/display_wave.c +++ b/src/common/display_wave.c @@ -23,7 +23,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "sender.h" #define HEIGHT 11 diff --git a/src/common/main_mobile.c b/src/common/main_mobile.c index b4f93430..bb83cf8c 100644 --- a/src/common/main_mobile.c +++ b/src/common/main_mobile.c @@ -29,7 +29,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "main_mobile.h" #include "debug.h" #include "sender.h" diff --git a/src/common/sender.c b/src/common/sender.c index bd4baff1..ff14e932 100644 --- a/src/common/sender.c +++ b/src/common/sender.c @@ -24,7 +24,7 @@ #include #include #include -#include "sample.h" +#include "../libsample/sample.h" #include "debug.h" #include "sender.h" #include "../libtimer/timer.h" diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am index c6a231eb..a920e032 100644 --- a/src/jtacs/Makefile.am +++ b/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) \ diff --git a/src/libcompandor/compandor.c b/src/libcompandor/compandor.c index c2a326cc..3a2ca9b8 100644 --- a/src/libcompandor/compandor.c +++ b/src/libcompandor/compandor.c @@ -21,7 +21,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "compandor.h" //#define db2level(db) pow(10, (double)db / 20.0) diff --git a/src/libdtmf/dtmf_encode.c b/src/libdtmf/dtmf_encode.c index 64139541..53bd1b6d 100644 --- a/src/libdtmf/dtmf_encode.c +++ b/src/libdtmf/dtmf_encode.c @@ -20,7 +20,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "dtmf_encode.h" #define PI M_PI diff --git a/src/libemphasis/emphasis.c b/src/libemphasis/emphasis.c index e4ee95bb..7a431982 100644 --- a/src/libemphasis/emphasis.c +++ b/src/libemphasis/emphasis.c @@ -21,7 +21,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../libfilter/iir_filter.h" #include "emphasis.h" diff --git a/src/libfilter/iir_filter.c b/src/libfilter/iir_filter.c index 2f6bb1d9..50dabfd2 100644 --- a/src/libfilter/iir_filter.c +++ b/src/libfilter/iir_filter.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "iir_filter.h" #define PI M_PI diff --git a/src/libfm/fm.c b/src/libfm/fm.c index 0e47d8a2..e633f33e 100644 --- a/src/libfm/fm.c +++ b/src/libfm/fm.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "fm.h" //#define FAST_SINE diff --git a/src/libfsk/fsk.c b/src/libfsk/fsk.c index fecd3bf4..abdc1476 100644 --- a/src/libfsk/fsk.c +++ b/src/libfsk/fsk.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "fsk.h" diff --git a/src/libgoertzel/goertzel.c b/src/libgoertzel/goertzel.c index 7c926fb2..e99c697b 100644 --- a/src/libgoertzel/goertzel.c +++ b/src/libgoertzel/goertzel.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "goertzel.h" diff --git a/src/libjitter/jitter.c b/src/libjitter/jitter.c index 54009717..b1922fc5 100644 --- a/src/libjitter/jitter.c +++ b/src/libjitter/jitter.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "jitter.h" diff --git a/src/libmncc/mncc_console.c b/src/libmncc/mncc_console.c index ac356c34..5bfbc9fa 100644 --- a/src/libmncc/mncc_console.c +++ b/src/libmncc/mncc_console.c @@ -24,7 +24,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libsamplerate/samplerate.h" #include "../libjitter/jitter.h" #include "../common/debug.h" diff --git a/src/libmncc/mncc_cross.c b/src/libmncc/mncc_cross.c index ea2c04f1..9609d78a 100644 --- a/src/libmncc/mncc_cross.c +++ b/src/libmncc/mncc_cross.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "cause.h" diff --git a/src/libmncc/mncc_sock.c b/src/libmncc/mncc_sock.c index 33c27323..7f90b119 100644 --- a/src/libmncc/mncc_sock.c +++ b/src/libmncc/mncc_sock.c @@ -26,7 +26,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/call.h" #include "cause.h" diff --git a/src/libsample/Makefile.am b/src/libsample/Makefile.am new file mode 100644 index 00000000..5ae865c3 --- /dev/null +++ b/src/libsample/Makefile.am @@ -0,0 +1,6 @@ +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) + +noinst_LIBRARIES = libsample.a + +libsample_a_SOURCES = \ + sample.c diff --git a/src/common/sample.c b/src/libsample/sample.c similarity index 100% rename from src/common/sample.c rename to src/libsample/sample.c diff --git a/src/common/sample.h b/src/libsample/sample.h similarity index 100% rename from src/common/sample.h rename to src/libsample/sample.h diff --git a/src/libsamplerate/samplerate.c b/src/libsamplerate/samplerate.c index fd2fea95..1ad6904c 100644 --- a/src/libsamplerate/samplerate.c +++ b/src/libsamplerate/samplerate.c @@ -22,7 +22,7 @@ #include #include #include -#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) diff --git a/src/libscrambler/scrambler.c b/src/libscrambler/scrambler.c index ad57b089..6dd86a41 100644 --- a/src/libscrambler/scrambler.c +++ b/src/libscrambler/scrambler.c @@ -19,7 +19,7 @@ #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "scrambler.h" #define PI M_PI diff --git a/src/libsdr/display_iq.c b/src/libsdr/display_iq.c index 350d0764..dfe64ec1 100644 --- a/src/libsdr/display_iq.c +++ b/src/libsdr/display_iq.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/sender.h" /* must be odd value! */ diff --git a/src/libsdr/display_spectrum.c b/src/libsdr/display_spectrum.c index 6c602372..a7f6150c 100644 --- a/src/libsdr/display_spectrum.c +++ b/src/libsdr/display_spectrum.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/sender.h" #include "../libfft/fft.h" diff --git a/src/libsdr/sdr.c b/src/libsdr/sdr.c index 69e07c14..f56b2b70 100644 --- a/src/libsdr/sdr.c +++ b/src/libsdr/sdr.c @@ -29,7 +29,7 @@ enum paging_signal; #define __USE_GNU #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libfm/fm.h" #include "../libtimer/timer.h" #include "../common/sender.h" diff --git a/src/libsdr/sdr_config.c b/src/libsdr/sdr_config.c index 0ab24bf1..078e179b 100644 --- a/src/libsdr/sdr_config.c +++ b/src/libsdr/sdr_config.c @@ -24,7 +24,7 @@ enum paging_signal; #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "sdr.h" #include "sdr_config.h" diff --git a/src/libsound/sound_alsa.c b/src/libsound/sound_alsa.c index a0fe878c..b3ab8b8c 100644 --- a/src/libsound/sound_alsa.c +++ b/src/libsound/sound_alsa.c @@ -21,7 +21,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../common/sender.h" diff --git a/src/libwave/wave.c b/src/libwave/wave.c index a3580688..86afc105 100644 --- a/src/libwave/wave.c +++ b/src/libwave/wave.c @@ -24,7 +24,7 @@ #include #include #include -#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 */ diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am index 2c425ad1..8e9bbcf9 100644 --- a/src/nmt/Makefile.am +++ b/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) \ diff --git a/src/nmt/dms.c b/src/nmt/dms.c index 6fc0c5cd..f71ddf7b 100644 --- a/src/nmt/dms.c +++ b/src/nmt/dms.c @@ -21,7 +21,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "nmt.h" diff --git a/src/nmt/dsp.c b/src/nmt/dsp.c index 8f583523..d7068601 100644 --- a/src/nmt/dsp.c +++ b/src/nmt/dsp.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "nmt.h" #include "transaction.h" diff --git a/src/nmt/frame.c b/src/nmt/frame.c index 05b322a6..e699709b 100644 --- a/src/nmt/frame.c +++ b/src/nmt/frame.c @@ -22,7 +22,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../libhagelbarger/hagelbarger.h" #include "nmt.h" diff --git a/src/nmt/main.c b/src/nmt/main.c index 684daa89..460ec57b 100644 --- a/src/nmt/main.c +++ b/src/nmt/main.c @@ -26,7 +26,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/main_mobile.h" #include "../common/debug.h" #include "nmt.h" diff --git a/src/nmt/nmt.c b/src/nmt/nmt.c index 65d9f928..5eddd8ae 100644 --- a/src/nmt/nmt.c +++ b/src/nmt/nmt.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../libmncc/cause.h" #include "nmt.h" diff --git a/src/nmt/sms.c b/src/nmt/sms.c index 3050f375..d36708dc 100644 --- a/src/nmt/sms.c +++ b/src/nmt/sms.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "nmt.h" diff --git a/src/nmt/transaction.c b/src/nmt/transaction.c index c02408eb..ae35f979 100644 --- a/src/nmt/transaction.c +++ b/src/nmt/transaction.c @@ -21,7 +21,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "nmt.h" #include "transaction.h" diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am index 0b957571..6a706802 100644 --- a/src/r2000/Makefile.am +++ b/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) \ diff --git a/src/r2000/dsp.c b/src/r2000/dsp.c index f6a2adc7..45de2c26 100644 --- a/src/r2000/dsp.c +++ b/src/r2000/dsp.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "r2000.h" #include "dsp.h" diff --git a/src/r2000/main.c b/src/r2000/main.c index 066916c1..4789d9e0 100644 --- a/src/r2000/main.c +++ b/src/r2000/main.c @@ -26,7 +26,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/main_mobile.h" #include "../common/debug.h" #include "r2000.h" diff --git a/src/r2000/r2000.c b/src/r2000/r2000.c index 0784f8b4..4ddebaa2 100644 --- a/src/r2000/r2000.c +++ b/src/r2000/r2000.c @@ -25,7 +25,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../libmncc/cause.h" #include "r2000.h" diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am index 1d6d43a6..4f57fa1e 100644 --- a/src/tacs/Makefile.am +++ b/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) \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 6e1b2bf6..57cf665d 100644 --- a/src/test/Makefile.am +++ b/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) \ diff --git a/src/test/test_compandor.c b/src/test/test_compandor.c index d222928d..4f916a8c 100644 --- a/src/test/test_compandor.c +++ b/src/test/test_compandor.c @@ -2,7 +2,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libcompandor/compandor.h" #define level2db(level) (20 * log10(level)) diff --git a/src/test/test_dms.c b/src/test/test_dms.c index 74f7eb83..18459b73 100644 --- a/src/test/test_dms.c +++ b/src/test/test_dms.c @@ -4,7 +4,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../nmt/nmt.h" diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c index 1add085b..7b87068b 100644 --- a/src/test/test_emphasis.c +++ b/src/test/test_emphasis.c @@ -2,7 +2,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libfilter/iir_filter.h" #include "../libemphasis/emphasis.h" #include "../common/debug.h" diff --git a/src/test/test_filter.c b/src/test/test_filter.c index 10b13931..8a30dab1 100644 --- a/src/test/test_filter.c +++ b/src/test/test_filter.c @@ -2,7 +2,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libfilter/iir_filter.h" #include "../common/debug.h" diff --git a/src/test/test_performance.c b/src/test/test_performance.c index 100c0501..3da9246b 100644 --- a/src/test/test_performance.c +++ b/src/test/test_performance.c @@ -3,7 +3,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libfilter/iir_filter.h" #include "../libfm/fm.h" #include "../common/debug.h" diff --git a/src/test/test_sms.c b/src/test/test_sms.c index 63726cad..69f6a08f 100644 --- a/src/test/test_sms.c +++ b/src/test/test_sms.c @@ -4,7 +4,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../common/debug.h" #include "../nmt/nmt.h" diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am index d1677e47..6327fb0e 100644 --- a/src/tv/Makefile.am +++ b/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) \ diff --git a/src/tv/bas.c b/src/tv/bas.c index 86df4433..24b7d997 100644 --- a/src/tv/bas.c +++ b/src/tv/bas.c @@ -20,7 +20,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libfilter/iir_filter.h" #include "bas.h" #include "vcr.h" diff --git a/src/tv/fubk.c b/src/tv/fubk.c index 56213e9a..23e5e326 100644 --- a/src/tv/fubk.c +++ b/src/tv/fubk.c @@ -20,7 +20,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "fubk.h" #include "font.h" diff --git a/src/tv/image.c b/src/tv/image.c index 85ca9f5f..b2dcc456 100644 --- a/src/tv/image.c +++ b/src/tv/image.c @@ -19,7 +19,7 @@ #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "image.h" /* render image line starting with x and end with LINE_LENGTH diff --git a/src/tv/main.c b/src/tv/main.c index ed4558f5..4c2a2ccc 100644 --- a/src/tv/main.c +++ b/src/tv/main.c @@ -27,7 +27,7 @@ enum paging_signal; #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "../libfilter/iir_filter.h" #include "../libfm/fm.h" #include "../libwave/wave.h" diff --git a/src/tv/tv_modulate.c b/src/tv/tv_modulate.c index ac93ece4..f6850a5d 100644 --- a/src/tv/tv_modulate.c +++ b/src/tv/tv_modulate.c @@ -19,7 +19,7 @@ #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "tv_modulate.h" #define WHITE_MODULATION 0.1 diff --git a/src/tv/vcr.c b/src/tv/vcr.c index cfbe84d2..673c65f2 100644 --- a/src/tv/vcr.c +++ b/src/tv/vcr.c @@ -20,7 +20,7 @@ #include #include #include -#include "../common/sample.h" +#include "../libsample/sample.h" #include "vcr.h" /* test ID of calibration part: