Restructure: Move sound from common code to 'libsound'

pull/1/head
Andreas Eversberg 5 years ago
parent 0e3e4d9230
commit 45a5568f70
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 2
      src/Makefile.am
  4. 1
      src/amps/Makefile.am
  5. 1
      src/anetz/Makefile.am
  6. 1
      src/bnetz/Makefile.am
  7. 1
      src/cnetz/Makefile.am
  8. 1
      src/common/Makefile.am
  9. 2
      src/common/sender.h
  10. 1
      src/jtacs/Makefile.am
  11. 2
      src/libmncc/mncc_console.c
  12. 6
      src/libsound/Makefile.am
  13. 0
      src/libsound/sound.h
  14. 6
      src/libsound/sound_alsa.c
  15. 1
      src/nmt/Makefile.am
  16. 1
      src/r2000/Makefile.am
  17. 1
      src/tacs/Makefile.am
  18. 4
      src/test/Makefile.am

1
.gitignore vendored

@ -37,6 +37,7 @@ src/libfilter/libfilter.a
src/libwave/libwave.a
src/libfft/libfft.a
src/libmncc/libmncc.a
src/libsound/libsound.a
src/common/libcommon.a
src/common/libmobile.a
src/anetz/libgermanton.a

@ -92,6 +92,7 @@ AC_OUTPUT(
src/libwave/Makefile
src/libfft/Makefile
src/libmncc/Makefile
src/libsound/Makefile
src/common/Makefile
src/anetz/Makefile
src/bnetz/Makefile

@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = libimage libcompandor libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfsk libfm libfilter libwave libfft libmncc common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
SUBDIRS = libsound libimage libcompandor libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfsk libfm libfilter libwave libfft libmncc common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test

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

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

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

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

@ -5,7 +5,6 @@ noinst_LIBRARIES = libcommon.a libmobile.a
libcommon_a_SOURCES = \
sample.c \
debug.c \
sound_alsa.c \
display_wave.c \
display_measurements.c

@ -1,4 +1,4 @@
#include "sound.h"
#include "../libsound/sound.h"
#ifdef HAVE_SDR
#include "sdr.h"
#endif

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

@ -33,7 +33,7 @@
#include "mncc_console.h"
#include "cause.h"
#include "../common/call.h"
#include "../common/sound.h"
#include "../libsound/sound.h"
static int new_callref = 0; /* toward mobile */

@ -0,0 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libsound.a
libsound_a_SOURCES = \
sound_alsa.c

@ -21,9 +21,9 @@
#include <stdint.h>
#include <math.h>
#include <alsa/asoundlib.h>
#include "sample.h"
#include "debug.h"
#include "sender.h"
#include "../common/sample.h"
#include "../common/debug.h"
#include "../common/sender.h"
typedef struct sound {
snd_pcm_t *phandle, *chandle;

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

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

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

@ -24,6 +24,7 @@ test_filter_LDADD = \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsound/libsound.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
@ -56,6 +57,7 @@ test_emphasis_LDADD = \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsound/libsound.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
@ -77,6 +79,7 @@ test_dms_LDADD = \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsound/libsound.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
@ -98,6 +101,7 @@ test_sms_LDADD = \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsound/libsound.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \

Loading…
Cancel
Save