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, 50 insertions, 0 deletions

diff --git a/gr-vocoder/include/vocoder_codec2_decode_ps.h b/gr-vocoder/include/vocoder_codec2_decode_ps.h
new file mode 100644
index 000000000..02b80a454
--- /dev/null
+++ b/gr-vocoder/include/vocoder_codec2_decode_ps.h
@@ -0,0 +1,50 @@
+/* -*- 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.
+ */
+#ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H
+#define INCLUDED_VOCODER_CODEC2_DECODE_PS_H
+
+#include <gr_sync_interpolator.h>
+
+class vocoder_codec2_decode_ps;
+typedef boost::shared_ptr<vocoder_codec2_decode_ps> vocoder_codec2_decode_ps_sptr;
+
+vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+
+/*!
+ * \brief CODEC2 Vocoder Decoder
+ * \ingroup vocoder_blk
+ */
+class vocoder_codec2_decode_ps : public gr_sync_interpolator {
+  void *d_codec2;
+
+  friend vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+  vocoder_codec2_decode_ps ();
+
+public:
+  ~vocoder_codec2_decode_ps ();
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_VOCODER_CODEC2_DECODE_PS_H */