diff options
Diffstat (limited to 'gr-vocoder')
30 files changed, 3 insertions, 861 deletions
diff --git a/gr-vocoder/.gitignore b/gr-vocoder/.gitignore deleted file mode 100644 index a37fc0c1a..000000000 --- a/gr-vocoder/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/*.pc diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index e800cff00..19f0dbec9 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -35,6 +35,8 @@ GR_SET_GLOBAL(GR_VOCODER_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ) +SET(GR_PKG_VOCODER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/vocoder) + ######################################################################## # Begin conditional configuration ######################################################################## diff --git a/gr-vocoder/Makefile.am b/gr-vocoder/Makefile.am deleted file mode 100644 index c280358a8..000000000 --- a/gr-vocoder/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -SUBDIRS = include lib python swig grc apps examples doc - -if PYTHON -SUBDIRS += python swig -endif - -pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = gnuradio-vocoder.pc diff --git a/gr-vocoder/apps/.gitignore b/gr-vocoder/apps/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-vocoder/apps/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-vocoder/apps/Makefile.am b/gr-vocoder/apps/Makefile.am deleted file mode 100644 index b1c7b44d5..000000000 --- a/gr-vocoder/apps/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -SUBDIRS = diff --git a/gr-vocoder/doc/.gitignore b/gr-vocoder/doc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-vocoder/doc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-vocoder/doc/Makefile.am b/gr-vocoder/doc/Makefile.am deleted file mode 100644 index a277264fe..000000000 --- a/gr-vocoder/doc/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -SUBDIRS = - -dist_gr_doc_DATA = \ - README.vocoder diff --git a/gr-vocoder/examples/.gitignore b/gr-vocoder/examples/.gitignore deleted file mode 100644 index 0a864cc38..000000000 --- a/gr-vocoder/examples/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in - diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt index 76a757826..769ddf602 100644 --- a/gr-vocoder/examples/CMakeLists.txt +++ b/gr-vocoder/examples/CMakeLists.txt @@ -32,6 +32,6 @@ GR_PYTHON_INSTALL( g723_40_audio_loopback.py gsm_audio_loopback.py ulaw_audio_loopback.py - DESTINATION ${GR_PKG_DATA_DIR}/examples/vocoder + DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR} COMPONENT "vocoder_examples" ) diff --git a/gr-vocoder/examples/Makefile.am b/gr-vocoder/examples/Makefile.am deleted file mode 100644 index 32176cf23..000000000 --- a/gr-vocoder/examples/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -ourdatadir = $(exampledir)/vocoder - -dist_ourdata_SCRIPTS = \ - alaw_audio_loopback.py \ - codec2_audio_loopback.py \ - cvsd_audio_loopback.py \ - g721_audio_loopback.py \ - g723_24_audio_loopback.py \ - g723_40_audio_loopback.py \ - gsm_audio_loopback.py \ - ulaw_audio_loopback.py diff --git a/gr-vocoder/grc/.gitignore b/gr-vocoder/grc/.gitignore deleted file mode 100644 index d2e2e9ce8..000000000 --- a/gr-vocoder/grc/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Makefile -/Makefile.in -/.libs -/.deps -/gnuradio -/guile -/python diff --git a/gr-vocoder/grc/Makefile.am b/gr-vocoder/grc/Makefile.am deleted file mode 100644 index f25cb9ce6..000000000 --- a/gr-vocoder/grc/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright 2011-2012 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -grcblocksdir = $(grc_blocksdir) - -dist_grcblocks_DATA = \ - vocoder_alaw_decode_bs.xml \ - vocoder_alaw_encode_sb.xml \ - vocoder_block_tree.xml \ - vocoder_codec2_decode_ps.xml \ - vocoder_codec2_encode_sp.xml \ - vocoder_cvsd_decode_bs.xml \ - vocoder_cvsd_decode.xml \ - vocoder_cvsd_encode_sb.xml \ - vocoder_cvsd_encode.xml \ - vocoder_g721_decode_bs.xml \ - vocoder_g721_encode_sb.xml \ - vocoder_g723_24_decode_bs.xml \ - vocoder_g723_24_encode_sb.xml \ - vocoder_g723_40_decode_bs.xml \ - vocoder_g723_40_encode_sb.xml \ - vocoder_gsm_fr_decode_ps.xml \ - vocoder_gsm_fr_encode_sp.xml \ - vocoder_ulaw_decode_bs.xml \ - vocoder_ulaw_encode_sb.xml diff --git a/gr-vocoder/include/.gitignore b/gr-vocoder/include/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-vocoder/include/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am deleted file mode 100644 index b579333a3..000000000 --- a/gr-vocoder/include/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -# C/C++ headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - vocoder_api.h \ - vocoder_alaw_decode_bs.h \ - vocoder_alaw_encode_sb.h \ - vocoder_codec2_decode_ps.h \ - vocoder_codec2_encode_sp.h \ - vocoder_cvsd_decode_bs.h \ - vocoder_cvsd_encode_sb.h \ - vocoder_g721_decode_bs.h \ - vocoder_g721_encode_sb.h \ - vocoder_g723_24_decode_bs.h \ - vocoder_g723_24_encode_sb.h \ - vocoder_g723_40_decode_bs.h \ - vocoder_g723_40_encode_sb.h \ - vocoder_gsm_fr_decode_ps.h \ - vocoder_gsm_fr_encode_sp.h \ - vocoder_ulaw_decode_bs.h \ - vocoder_ulaw_encode_sb.h diff --git a/gr-vocoder/lib/.gitignore b/gr-vocoder/lib/.gitignore deleted file mode 100644 index d2e2e9ce8..000000000 --- a/gr-vocoder/lib/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Makefile -/Makefile.in -/.libs -/.deps -/gnuradio -/guile -/python diff --git a/gr-vocoder/lib/Makefile.am b/gr-vocoder/lib/Makefile.am deleted file mode 100644 index 158347ffe..000000000 --- a/gr-vocoder/lib/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -SUBDIRS = codec2 g7xx gsm . - -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \ - -I$(top_srcdir)/gr-vocoder/include - -lib_LTLIBRARIES = libgnuradio-vocoder.la - -libgnuradio_vocoder_la_SOURCES = \ - vocoder_alaw_decode_bs.cc \ - vocoder_alaw_encode_sb.cc \ - vocoder_codec2_decode_ps.cc \ - vocoder_codec2_encode_sp.cc \ - vocoder_cvsd_decode_bs.cc \ - vocoder_cvsd_encode_sb.cc \ - vocoder_g721_decode_bs.cc \ - vocoder_g721_encode_sb.cc \ - vocoder_g723_24_decode_bs.cc \ - vocoder_g723_24_encode_sb.cc \ - vocoder_g723_40_decode_bs.cc \ - vocoder_g723_40_encode_sb.cc \ - vocoder_gsm_fr_decode_ps.cc \ - vocoder_gsm_fr_encode_sp.cc \ - vocoder_ulaw_decode_bs.cc \ - vocoder_ulaw_encode_sb.cc - -libgnuradio_vocoder_la_LIBADD = \ - $(GNURADIO_CORE_LA) \ - codec2/libcodec2.la \ - g7xx/libg7xx.la \ - gsm/libgsm.la - -libgnuradio_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) diff --git a/gr-vocoder/lib/codec2/.gitignore b/gr-vocoder/lib/codec2/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-vocoder/lib/codec2/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-vocoder/lib/codec2/Makefile.am b/gr-vocoder/lib/codec2/Makefile.am deleted file mode 100644 index ae2094eff..000000000 --- a/gr-vocoder/lib/codec2/Makefile.am +++ /dev/null @@ -1,125 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -AM_CFLAGS = -fPIC -O3 - -# Helper program to create codebook source -noinst_PROGRAMS = generate_codebook -generate_codebook_LDFLAGS = -lm - -# lsp quantisers -CODEBOOKS= \ - $(srcdir)/codebook/lsp1.txt \ - $(srcdir)/codebook/lsp2.txt \ - $(srcdir)/codebook/lsp3.txt \ - $(srcdir)/codebook/lsp4.txt \ - $(srcdir)/codebook/lsp5.txt \ - $(srcdir)/codebook/lsp6.txt \ - $(srcdir)/codebook/lsp7.txt \ - $(srcdir)/codebook/lsp8.txt \ - $(srcdir)/codebook/lsp9.txt \ - $(srcdir)/codebook/lsp10.txt - -# lspd quantisers -CODEBOOKSD= \ - $(srcdir)/codebook/dlsp1.txt \ - $(srcdir)/codebook/dlsp2.txt \ - $(srcdir)/codebook/dlsp3.txt \ - $(srcdir)/codebook/dlsp4.txt \ - $(srcdir)/codebook/dlsp5.txt \ - $(srcdir)/codebook/dlsp6.txt \ - $(srcdir)/codebook/dlsp7.txt \ - $(srcdir)/codebook/dlsp8.txt \ - $(srcdir)/codebook/dlsp9.txt \ - $(srcdir)/codebook/dlsp10.txt - -# lspd VQ quantisers -CODEBOOKSDVQ= \ - $(srcdir)/codebook/dlsp1.txt \ - $(srcdir)/codebook/dlsp2.txt \ - $(srcdir)/codebook/dlsp3.txt \ - $(srcdir)/codebook/dlsp4.txt \ - $(srcdir)/codebook/dlsp5.txt - -# Generate codebook sources from text files -GENERATED_C = \ - codebook.c \ - codebookd.c \ - codebookdvq.c - -BUILT_SOURCES += $(GENERATED_C) - -codebook.c: $(builddir)/generate_codebook $(CODEBOOKS) - $(builddir)/generate_codebook lsp_cb $(CODEBOOKS) > codebook.c - -codebookd.c: $(builddir)/generate_codebook $(CODEBOOKSD) - $(builddir)/generate_codebook lsp_cbd $(CODEBOOKSD) > codebookd.c - -codebookdvq.c: $(builddir)/generate_codebook $(CODEBOOKSDVQ) - $(builddir)/generate_codebook lsp_cbdvq $(CODEBOOKSDVQ) > codebookdvq.c - -# Convenience library for linking into blocks -noinst_LTLIBRARIES = libcodec2.la - -libcodec2_la_CFLAGS = $(AM_CFLAGS) - -libcodec2_la_SOURCES = \ - dump.c \ - lpc.c \ - nlp.c \ - postfilter.c \ - sine.c \ - codec2.c \ - fft.c \ - kiss_fft.c \ - interp.c \ - lsp.c \ - phase.c \ - quantise.c \ - pack.c \ - $(GENERATED_C) - -# Evil inclusion of glottal.c by phase.c -EXTRA_DIST += glottal.c - -# Headers used locally but not installed in system -noinst_HEADERS = \ - codec2.h \ - codec2_internal.h \ - defines.h \ - kiss_fft.h\ - _kiss_fft_guts.h \ - fft.h \ - interp.h \ - lsp.h \ - phase.h \ - quantise.h \ - comp.h \ - dump.h \ - lpc.h \ - nlp.h \ - postfilter.h \ - sine.h - -EXTRA_DIST += $(CODEBOOKS) $(CODEBOOKSD) $(CODEBOOKSDVQ) - diff --git a/gr-vocoder/lib/g7xx/.gitignore b/gr-vocoder/lib/g7xx/.gitignore deleted file mode 100644 index a02b6ff73..000000000 --- a/gr-vocoder/lib/g7xx/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo diff --git a/gr-vocoder/lib/g7xx/Makefile.am b/gr-vocoder/lib/g7xx/Makefile.am deleted file mode 100644 index 929fd23ba..000000000 --- a/gr-vocoder/lib/g7xx/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2001,2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -noinst_LTLIBRARIES = libg7xx.la -libg7xx_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h - -EXTRA_DIST += encode.c decode.c diff --git a/gr-vocoder/lib/gsm/.gitignore b/gr-vocoder/lib/gsm/.gitignore deleted file mode 100644 index a02b6ff73..000000000 --- a/gr-vocoder/lib/gsm/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo diff --git a/gr-vocoder/lib/gsm/Makefile.am b/gr-vocoder/lib/gsm/Makefile.am deleted file mode 100644 index d0872ff39..000000000 --- a/gr-vocoder/lib/gsm/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright 2005,2008 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -# Machine- or installation dependent flags you should configure to port - -SASR = -DSASR -######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1) - -MULHACK = -DUSE_FLOAT_MUL -######### Define this if your host multiplies floats faster than integers, -######### e.g. on a SPARCstation. - -FAST = -DFAST -######### Define together with USE_FLOAT_MUL to enable the GSM library's -######### approximation option for incorrect, but good-enough results. - -# LTP_CUT = -DLTP_CUT -LTP_CUT = -######### Define to enable the GSM library's long-term correlation -######### approximation option---faster, but worse; works for -######### both integer and floating point multiplications. -######### This flag is still in the experimental stage. - -OPTIONS = $(SASR) $(MULHACK) $(FAST) $(LTP_CUT) - -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \ - $(OPTIONS) $(WITH_INCLUDES) - -noinst_LTLIBRARIES = libgsm.la - -libgsm_la_SOURCES = \ - add.c \ - code.c \ - debug.c \ - decode.c \ - gsm_create.c \ - gsm_decode.c \ - gsm_destroy.c \ - gsm_encode.c \ - gsm_explode.c \ - gsm_implode.c \ - gsm_option.c \ - gsm_print.c \ - long_term.c \ - lpc.c \ - preprocess.c \ - rpe.c \ - short_term.c \ - table.c - -noinst_HEADERS = \ - config.h \ - gsm.h \ - private.h \ - proto.h \ - unproto.h diff --git a/gr-vocoder/python/.gitignore b/gr-vocoder/python/.gitignore deleted file mode 100644 index bf03975bb..000000000 --- a/gr-vocoder/python/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo -/run_tests diff --git a/gr-vocoder/python/Makefile.am b/gr-vocoder/python/Makefile.am deleted file mode 100644 index 4b6146ca7..000000000 --- a/gr-vocoder/python/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -vocoderdir = $(grpythondir)/vocoder - -TESTS = run_tests - -noinst_PYTHON = \ - qa_alaw_vocoder.py \ - qa_codec2_vocoder.py \ - qa_cvsd_vocoder.py \ - qa_g721_vocoder.py \ - qa_g723_24_vocoder.py \ - qa_g723_40_vocoder.py \ - qa_gsm_full_rate.py \ - qa_ulaw_vocoder.py - -vocoder_PYTHON = \ - __init__.py \ - cvsd.py - -EXTRA_DIST += run_tests.in diff --git a/gr-vocoder/python/run_tests.in b/gr-vocoder/python/run_tests.in deleted file mode 100644 index e0c61a6b4..000000000 --- a/gr-vocoder/python/run_tests.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# 1st parameter is absolute path to component source directory -# 2nd parameter is absolute path to component build directory -# 3rd parameter is path to Python QA directory - -@top_builddir@/run_tests.sh \ - @abs_top_srcdir@/gr-vocoder \ - @abs_top_builddir@/gr-vocoder \ - @srcdir@ diff --git a/gr-vocoder/swig/.gitignore b/gr-vocoder/swig/.gitignore deleted file mode 100644 index 6a0410b79..000000000 --- a/gr-vocoder/swig/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/run_guile_tests diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am deleted file mode 100644 index 465097a8d..000000000 --- a/gr-vocoder/swig/Makefile.am +++ /dev/null @@ -1,97 +0,0 @@ -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common -include $(top_srcdir)/Makefile.swig - -TESTS = -EXTRA_DIST += $(nobase_guile_DATA) - -AM_CPPFLAGS = \ - -I$(abs_top_srcdir)/gr-vocoder/include \ - $(STD_DEFINES_AND_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -if GUILE -nobase_guile_DATA = \ - gnuradio/vocoder_swig.scm -endif - -noinst_GUILE = vocoder.test - - -############################## -# SWIG interface and library - -TOP_SWIG_DOC_IFILES = \ - vocoder_swig_doc.i - -TOP_SWIG_IFILES = \ - $(TOP_SWIG_DOC_IFILES) \ - vocoder_swig.i - -BUILT_SOURCES += \ - $(TOP_SWIG_DOC_IFILES) - -EXTRA_DIST += \ - $(TOP_SWIG_DOC_IFILES) - -$(TOP_SWIG_DOC_IFILES): - `echo "" > $@` - -# Install so that they end up available as: -# import gnuradio.vocoder -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder -vocoder_swig_pythondir_category = \ - gnuradio/vocoder - -# additional libraries for linking with the SWIG-generated library -vocoder_swig_la_swig_libadd = \ - $(abs_top_builddir)/gr-vocoder/lib/libgnuradio-vocoder.la - -# additional SWIG files to be installed -vocoder_swig_swiginclude_headers = \ - vocoder_alaw_decode_bs.i \ - vocoder_alaw_encode_sb.i \ - vocoder_codec2_decode_ps.i \ - vocoder_codec2_encode_sp.i \ - vocoder_cvsd_decode_bs.i \ - vocoder_cvsd_encode_sb.i \ - vocoder_g721_decode_bs.i \ - vocoder_g721_encode_sb.i \ - vocoder_g723_24_decode_bs.i \ - vocoder_g723_24_encode_sb.i \ - vocoder_g723_40_decode_bs.i \ - vocoder_g723_40_encode_sb.i \ - vocoder_gsm_fr_encode_sp.i \ - vocoder_gsm_fr_decode_ps.i \ - vocoder_ulaw_decode_bs.i \ - vocoder_ulaw_encode_sb.i \ - $(TOP_SWIG_DOC_IFILE) - -vocoder_swig_swig_args = \ - -I$(abs_top_builddir)/gr-vocoder/lib - -if GUILE -TESTS += run_guile_tests -endif diff --git a/gr-vocoder/swig/Makefile.swig.gen b/gr-vocoder/swig/Makefile.swig.gen deleted file mode 100644 index b0d0504a8..000000000 --- a/gr-vocoder/swig/Makefile.swig.gen +++ /dev/null @@ -1,145 +0,0 @@ -# -*- Makefile -*- -# -# Copyright 2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -# Makefile.swig.gen for vocoder_swig.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/vocoder_swig -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/vocoder_swig -## -## The following can be overloaded to change the install location, but -## this has to be done in the including Makefile.am -before- -## Makefile.swig is included. - -vocoder_swig_pythondir_category ?= gnuradio/vocoder_swig -vocoder_swig_pylibdir_category ?= $(vocoder_swig_pythondir_category) -vocoder_swig_pythondir = $(pythondir)/$(vocoder_swig_pythondir_category) -vocoder_swig_pylibdir = $(pyexecdir)/$(vocoder_swig_pylibdir_category) - -# The .so libraries for the guile modules get installed whereever guile -# is installed, usually /usr/lib/guile/gnuradio/ -# FIXME: determince whether these should be installed with gnuradio. -vocoder_swig_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/vocoder_swig -# FIXME: determince whether these should be installed with gnuradio. -vocoder_swig_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -vocoder_swig_swigincludedir = $(swigincludedir) - -## This is a template file for a "generated" Makefile addition (in -## this case, "Makefile.swig.gen"). By including the top-level -## Makefile.swig, this file will be used to generate the SWIG -## dependencies. Assign the variable TOP_SWIG_FILES to be the list of -## SWIG .i files to generated wrappings for; there can be more than 1 -## so long as the names are unique (no sorting is done on the -## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i -## file will generate .cc, .py, and possibly .h files -- meaning that -## all of these files will have the same base name (that provided for -## the SWIG .i file). -## -## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the -## right thing. For more info, see < -## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -vocoder_swig_swiginclude_HEADERS = \ - vocoder_swig.i \ - $(vocoder_swig_swiginclude_headers) - -if PYTHON -vocoder_swig_pylib_LTLIBRARIES = \ - _vocoder_swig.la - -_vocoder_swig_la_SOURCES = \ - python/vocoder_swig.cc \ - $(vocoder_swig_la_swig_sources) - -vocoder_swig_python_PYTHON = \ - vocoder_swig.py \ - $(vocoder_swig_python) - -_vocoder_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(vocoder_swig_la_swig_libadd) - -_vocoder_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(vocoder_swig_la_swig_ldflags) - -_vocoder_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(vocoder_swig_la_swig_cxxflags) - -python/vocoder_swig.cc: vocoder_swig.py -vocoder_swig.py: vocoder_swig.i - -# Include the python dependencies for this file --include python/vocoder_swig.d - -endif # end of if python - -if GUILE - -vocoder_swig_scmlib_LTLIBRARIES = \ - libguile-gnuradio-vocoder_swig.la -libguile_gnuradio_vocoder_swig_la_SOURCES = \ - guile/vocoder_swig.cc \ - $(vocoder_swig_la_swig_sources) -nobase_vocoder_swig_scm_DATA = \ - gnuradio/vocoder_swig.scm \ - gnuradio/vocoder_swig-primitive.scm -libguile_gnuradio_vocoder_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(vocoder_swig_la_swig_libadd) -libguile_gnuradio_vocoder_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(vocoder_swig_la_swig_ldflags) -libguile_gnuradio_vocoder_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(vocoder_swig_la_swig_cxxflags) - -guile/vocoder_swig.cc: gnuradio/vocoder_swig.scm -gnuradio/vocoder_swig.scm: vocoder_swig.i -gnuradio/vocoder_swig-primitive.scm: gnuradio/vocoder_swig.scm - -# Include the guile dependencies for this file --include guile/vocoder_swig.d - -endif # end of GUILE - - diff --git a/gr-vocoder/swig/run_guile_tests.in b/gr-vocoder/swig/run_guile_tests.in deleted file mode 100644 index 5d08b0dd5..000000000 --- a/gr-vocoder/swig/run_guile_tests.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -. @top_builddir@/setup_guile_test_env - -# 1st argument is absolute path to hand coded guile source directory -# 2nd argument is absolute path to component C++ shared library build directory -# 3nd argument is absolute path to component SWIG build directory - -add_local_paths \ - @srcdir@ \ - @abs_builddir@ \ - @abs_builddir@ - -@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@ diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i index 931494307..8e956ff35 100644 --- a/gr-vocoder/swig/vocoder_swig.i +++ b/gr-vocoder/swig/vocoder_swig.i @@ -41,13 +41,3 @@ %include "vocoder_gsm_fr_encode_sp.i" %include "vocoder_ulaw_decode_bs.i" %include "vocoder_ulaw_encode_sb.i" - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-vocoder" "scm_init_gnuradio_gsm_vocoder_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif |