6 files changed, 310 insertions, 1 deletions
diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am
index b1c7b44d5..54c1e004d 100644
--- a/gr-vocoder/swig/Makefile.am
+++ b/gr-vocoder/swig/Makefile.am
@@ -20,5 +20,49 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
-SUBDIRS = 
+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_IFILES = \
+	vocoder_swig.i
+
+# 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_gsm_fr_encode_sp.i \
+	vocoder_gsm_fr_decode_ps.i
+
+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
new file mode 100644
index 000000000..b0d0504a8
--- /dev/null
+++ b/gr-vocoder/swig/Makefile.swig.gen
@@ -0,0 +1,145 @@
+# -*- 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
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-vocoder/swig/run_guile_tests.in
@@ -0,0 +1,14 @@
+#!/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_gsm_fr_decode_ps.i b/gr-vocoder/swig/vocoder_gsm_fr_decode_ps.i
new file mode 100644
index 000000000..8e96689f6
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_gsm_fr_decode_ps.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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 "vocoder_gsm_fr_decode_ps.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,gsm_fr_decode_ps);
+
+vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps();
+
+class vocoder_gsm_fr_decode_ps : public gr_sync_interpolator 
+{
+public:
+  ~vocoder_gsm_fr_decode_ps();
+};
diff --git a/gr-vocoder/swig/vocoder_gsm_fr_encode_sp.i b/gr-vocoder/swig/vocoder_gsm_fr_encode_sp.i
new file mode 100644
index 000000000..8216336a9
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_gsm_fr_encode_sp.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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 "vocoder_gsm_fr_encode_sp.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,gsm_fr_encode_sp);
+
+vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp();
+
+class vocoder_gsm_fr_encode_sp : public gr_sync_decimator 
+{
+public:
+  ~vocoder_gsm_fr_encode_sp();
+};
diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i
new file mode 100644
index 000000000..7876366f7
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_swig.i
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * 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 "gnuradio.i"
+
+%include "vocoder_gsm_fr_encode_sp.i"
+%include "vocoder_gsm_fr_decode_ps.i"
+
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-vocoder" "scm_init_gnuradio_gsm_vocoder_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif