Restructure: Move compandor from common code to 'libcompandor'

pull/1/head
Andreas Eversberg 5 years ago
parent 083ea4edaa
commit 9776736cc4
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 2
      src/Makefile.am
  4. 1
      src/amps/Makefile.am
  5. 2
      src/amps/amps.h
  6. 1
      src/cnetz/Makefile.am
  7. 2
      src/cnetz/cnetz.h
  8. 1
      src/common/Makefile.am
  9. 1
      src/jtacs/Makefile.am
  10. 6
      src/libcompandor/Makefile.am
  11. 2
      src/libcompandor/compandor.c
  12. 1
      src/libcompandor/compandor.h
  13. 1
      src/nmt/Makefile.am
  14. 2
      src/nmt/nmt.h
  15. 1
      src/r2000/Makefile.am
  16. 2
      src/r2000/r2000.h
  17. 1
      src/tacs/Makefile.am
  18. 1
      src/test/Makefile.am
  19. 2
      src/test/test_compandor.c

1
.gitignore vendored

@ -20,6 +20,7 @@ compile
.libs
.dirstamp
m4
src/libcompandor/libcompandor.a
src/libgoertzel/libgoertzel.a
src/libjitter/libjitter.a
src/libsquelch/libsquelch.a

@ -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/libcompandor/Makefile
src/libgoertzel/Makefile
src/libjitter/Makefile
src/libsquelch/Makefile

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

@ -26,6 +26,7 @@ amps_SOURCES = \
amps_LDADD = \
$(COMMON_LA) \
libamps.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/common/libmobile.a \

@ -1,7 +1,7 @@
#include "../libgoertzel/goertzel.h"
#include "../common/sender.h"
#include "../libtimer/timer.h"
#include "../common/compandor.h"
#include "../libcompandor/compandor.h"
#include "sysinfo.h"
#include "transaction.h"

@ -17,6 +17,7 @@ cnetz_SOURCES = \
cnetz_LDADD = \
$(COMMON_LA) \
../anetz/libgermanton.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \

@ -1,4 +1,4 @@
#include "../common/compandor.h"
#include "../libcompandor/compandor.h"
#include "../libtimer/timer.h"
#include "../common/sender.h"
#include "fsk_demod.h"

@ -6,7 +6,6 @@ libcommon_a_SOURCES = \
sample.c \
debug.c \
sound_alsa.c \
compandor.c \
display_wave.c \
display_measurements.c

@ -12,6 +12,7 @@ jtacs_SOURCES = \
jtacs_LDADD = \
$(COMMON_LA) \
../amps/libamps.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/common/libmobile.a \

@ -0,0 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libcompandor.a
libcompandor_a_SOURCES = \
compandor.c

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

@ -1,3 +1,4 @@
typedef struct compandor {
struct {
double unaffected;

@ -22,6 +22,7 @@ nmt_SOURCES = \
nmt_LDADD = \
$(COMMON_LA) \
libdmssms.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \

@ -1,6 +1,6 @@
#include "../common/sender.h"
#include "../libtimer/timer.h"
#include "../common/compandor.h"
#include "../libcompandor/compandor.h"
#include "../libdtmf/dtmf_encode.h"
#include "../common/call.h"
#include "../libfsk/fsk.h"

@ -12,6 +12,7 @@ radiocom2000_SOURCES = \
main.c
radiocom2000_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
$(top_builddir)/src/common/libmobile.a \

@ -1,4 +1,4 @@
#include "../common/compandor.h"
#include "../libcompandor/compandor.h"
#include "../libtimer/timer.h"
#include "../common/sender.h"
#include "../common/call.h"

@ -13,6 +13,7 @@ tacs_SOURCES = \
tacs_LDADD = \
$(COMMON_LA) \
../amps/libamps.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/common/libmobile.a \

@ -32,6 +32,7 @@ test_compandor_SOURCES = dummy.x test_compandor.c
test_compandor_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \

@ -3,7 +3,7 @@
#include <math.h>
#include <string.h>
#include "../common/sample.h"
#include "../common/compandor.h"
#include "../libcompandor/compandor.h"
#define level2db(level) (20 * log10(level))
#define db2level(db) pow(10, (double)db / 20.0)

Loading…
Cancel
Save