Merge branch 'next' into digital

Conflicts:
	gnuradio-core/src/lib/general/general.i
	gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
	gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
	gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
	gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
	gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
	gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
	gr-digital/lib/digital_constellation_receiver_cb.cc
	gr-digital/python/Makefile.am
	gr-digital/python/__init__.py
	gr-digital/python/generic_mod_demod.py
	gr-digital/python/pkt.py
	gr-digital/python/psk2.py
	gr-digital/python/qam.py

1 files changed, 45 insertions, 0 deletions

diff --git a/gr-vocoder/examples/codec2_audio_loopback.py b/gr-vocoder/examples/codec2_audio_loopback.py
new file mode 100755
index 000000000..54b453f8a
--- /dev/null
+++ b/gr-vocoder/examples/codec2_audio_loopback.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# Copyright 2005,2007,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.
+# 
+
+from gnuradio import gr
+from gnuradio import audio
+from gnuradio import vocoder
+
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.codec2_encode_sp()
+    dec = vocoder.codec2_decode_ps()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+    return tb
+
+if __name__ == '__main__':
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()