Merge branch 'master' into 8psk

Conflicts:
	gr-qtgui/lib/qtgui_time_sink_c.cc
	gr-trellis/src/lib/Makefile.am
	gr-trellis/src/lib/calc_metric.h
	gr-trellis/src/lib/trellis.i
	gr-trellis/src/lib/trellis_constellation_metrics_cf.i
	gr-trellis/src/lib/trellis_metric_type.h
	gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t

1 files changed, 50 insertions, 0 deletions

diff --git a/gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t b/gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
new file mode 100644
index 000000000..ca6b56199
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
@@ -0,0 +1,50 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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.
+ */
+
+// @WARNING@
+
+GR_SWIG_BLOCK_MAGIC(trellis,@BASE_NAME@);
+
+@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  const fsm &FSMo, int STo,
+  const fsm &FSMi, int STi,
+  const interleaver &INTERLEAVER,
+  int blocklength
+);
+
+class @NAME@ : public gr_sync_block
+{
+private:
+  @NAME@ (
+    const fsm &FSMo, int STo,
+    const fsm &FSMi, int STi,
+    const interleaver &INTERLEAVER,
+    int blocklength
+  );
+public:
+  fsm FSMo () const { return d_FSMo; }
+  int STo () const { return d_STo; }
+  fsm FSMi () const { return d_FSMi; }
+  int STi () const { return d_STi; }
+  interleaver INTERLEAVER () const { return d_INTERLEAVER; }
+  int blocklength () const { return d_blocklength; }
+};