Merge branch 'next' of gnuradio.org:gnuradio into next

6 files changed, 149 insertions, 1 deletions

diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am
index fbfd18c7c..b2a331394 100644
--- a/gr-vocoder/swig/Makefile.am
+++ b/gr-vocoder/swig/Makefile.am
@@ -57,12 +57,16 @@ vocoder_swig_la_swig_libadd = \
 
 # 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_gsm_fr_encode_sp.i \
-	vocoder_gsm_fr_decode_ps.i
+	vocoder_gsm_fr_decode_ps.i \
+	vocoder_ulaw_decode_bs.i \
+	vocoder_ulaw_encode_sb.i
 
 vocoder_swig_swig_args = \
 	-I$(abs_top_builddir)/gr-vocoder/lib
diff --git a/gr-vocoder/swig/vocoder_alaw_decode_bs.i b/gr-vocoder/swig/vocoder_alaw_decode_bs.i
new file mode 100644
index 000000000..f789c454f
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_alaw_decode_bs.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_alaw_decode_bs.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,alaw_decode_bs);
+
+vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
+
+class vocoder_alaw_decode_bs : public gr_sync_block
+{
+private:
+  vocoder_alaw_decode_bs();
+};
diff --git a/gr-vocoder/swig/vocoder_alaw_encode_sb.i b/gr-vocoder/swig/vocoder_alaw_encode_sb.i
new file mode 100644
index 000000000..9fe537d55
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_alaw_encode_sb.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_alaw_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,alaw_encode_sb);
+
+vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
+
+class vocoder_alaw_encode_sb : public gr_sync_block
+{
+private:
+  vocoder_alaw_encode_sb();
+};
diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i
index 9edb0dc0c..b339cc7a4 100644
--- a/gr-vocoder/swig/vocoder_swig.i
+++ b/gr-vocoder/swig/vocoder_swig.i
@@ -22,12 +22,16 @@
 
 %include "gnuradio.i"
 
+%include "vocoder_alaw_decode_bs.i"
+%include "vocoder_alaw_encode_sb.i"
 %include "vocoder_codec2_encode_sp.i"
 %include "vocoder_codec2_decode_ps.i"
 %include "vocoder_cvsd_decode_bs.i"
 %include "vocoder_cvsd_encode_sb.i"
 %include "vocoder_gsm_fr_encode_sp.i"
 %include "vocoder_gsm_fr_decode_ps.i"
+%include "vocoder_ulaw_decode_bs.i"
+%include "vocoder_ulaw_encode_sb.i"
 
 #if SWIGGUILE
 %scheme %{
diff --git a/gr-vocoder/swig/vocoder_ulaw_decode_bs.i b/gr-vocoder/swig/vocoder_ulaw_decode_bs.i
new file mode 100644
index 000000000..5e8e8c9ae
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_ulaw_decode_bs.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_ulaw_decode_bs.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,ulaw_decode_bs);
+
+vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
+
+class vocoder_ulaw_decode_bs : public gr_sync_block
+{
+private:
+  vocoder_ulaw_decode_bs();
+};
diff --git a/gr-vocoder/swig/vocoder_ulaw_encode_sb.i b/gr-vocoder/swig/vocoder_ulaw_encode_sb.i
new file mode 100644
index 000000000..1665df480
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_ulaw_encode_sb.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_ulaw_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,ulaw_encode_sb);
+
+vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
+
+class vocoder_ulaw_encode_sb : public gr_sync_block
+{
+private:
+  vocoder_ulaw_encode_sb();
+};