5 files changed, 67 insertions, 261 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
index b499b8fa32..2760eb77b9 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -115,21 +115,9 @@ class d8psk_mod(gr.hier_block2):
 
 	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
 
-        # Define components from objects
-        self.define_component("bytes2chunks", self.bytes2chunks)
-        self.define_component("symbol_mapper", self.symbol_mapper)
-#        self.define_component("diffenc", self.diffenc)
-        self.define_component("chunks2symbols", self.chunks2symbols)
-        self.define_component("rrc_filter", self.rrc_filter)
-
 	# Connect components
-        self.connect("self", 0, "bytes2chunks", 0)
-        self.connect("bytes2chunks", 0, "symbol_mapper", 0)
-#        self.connect("symbol_mapper", 0, "diffenc", 0)
-#        self.connect("diffenc", 0, "chunks2symbols", 0)
-        self.connect("symbol_mapper", 0, "chunks2symbols", 0)
-        self.connect("chunks2symbols", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "self", 0)
+	self.connect(self, self.bytes2chunks, self.symbol_mapper, self.chunks2symbols,
+		     self.rrc_filter, self)
 
         if verbose:
             self._print_verbage()
@@ -153,17 +141,10 @@ class d8psk_mod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self.define_component("bytes2chunks_dat", gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.define_component("symbol_mapper_dat", gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
-#        self.define_component("diffenc_dat", gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.define_component("chunks2symbols_dat", gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.define_component("rrc_filter_dat", gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-        self.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
-        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
-#        self.connect("diffenc", 0, "diffenc_dat", 0)
-        self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
-        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+        self.connect(self.bytes2chunks, gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
+        self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
+        self.connect(self.chunks2symbols, gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
+        self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
 
     def add_options(parser):
         """
@@ -295,27 +276,9 @@ class d8psk_demod(gr.hier_block2):
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
 
  
-        # Define components
-        self.define_component("pre_scaler", self.pre_scaler)
-        self.define_component("agc", self.agc)
-        self.define_component("rrc_filter", self.rrc_filter)
-        self.define_component("receiver", self.receiver)
-        self.define_component("slicer", self.slicer)
-        #self.define_component("diffdec", self.diffdec)
-        self.define_component("symbol_mapper", self.symbol_mapper)
-        self.define_component("unpack", self.unpack)
-
         # Connect and Initialize base class
-        self.connect("self", 0, "pre_scaler", 0)
-        self.connect("pre_scaler", 0, "agc", 0)
-        self.connect("agc", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "receiver", 0)
-        self.connect("receiver", 0, "slicer", 0)
-        #self.connect("slicer", 0, "diffdec", 0)
-        #self.connect("diffdec", 0, "symbol_mapper", 0)
-        self.connect("slicer", 0, "symbol_mapper", 0)
-        self.connect("symbol_mapper", 0, "unpack", 0)
-        self.connect("unpack", 0, "self", 0)
+	self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
+		     self.slicer, self.symbol_mapper, self.unpack, self)
 
         if verbose:
             self._print_verbage()
@@ -347,31 +310,13 @@ class d8psk_demod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self.define_component("prescaler_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.define_component("agc_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.define_component("rrc_filter_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.define_component("receiver_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.define_component("slicer_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-#        self.define_component("diffdec_dat",
-#                              gr.file_sink(gr.sizeof_char, "rx_diffdec.dat"))
-        self.define_component("symbol_mapper_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.define_component("unpack_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-        self.connect("pre_scaler", 0, "prescaler_dat", 0)
-        self.connect("agc", 0, "agc_dat", 0)
-        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-        self.connect("receiver", 0, "receiver_dat", 0)
-        self.connect("slicer", 0, "slicer_dat", 0)
-#        self.connect("diffdec", 0, "diffdec_dat", 0)
-        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
-        self.connect("unpack", 0, "unpack_dat", 0)
+        self.connect(self.pre_scaler, gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
+        self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
+        self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
+        self.connect(self.receiver, gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
+        self.connect(self.slicer, gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
+        self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
+        self.connect(self.unpack, gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
 
     def add_options(parser):
         """
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
index 36a2ea8af1..380fa54f21 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -113,19 +113,9 @@ class dbpsk_mod(gr.hier_block2):
 	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol,
                                                    self.rrc_taps)
 
-        self.define_component("bytes2chunks", self.bytes2chunks)
-        self.define_component("symbol_mapper", self.symbol_mapper)
-        self.define_component("diffenc", self.diffenc)
-        self.define_component("chunks2symbols", self.chunks2symbols)
-        self.define_component("rrc_filter", self.rrc_filter)
-
 	# Connect components
-        self.connect("self", 0, "bytes2chunks", 0)
-        self.connect("bytes2chunks", 0, "symbol_mapper", 0)
-        self.connect("symbol_mapper", 0, "diffenc", 0)
-        self.connect("diffenc", 0, "chunks2symbols", 0)
-        self.connect("chunks2symbols", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "self", 0)
+	self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc, 
+		     self.chunks2symbols, self.rrc_filter, self)
 
         if verbose:
             self._print_verbage()
@@ -168,22 +158,11 @@ class dbpsk_mod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self.define_component("bytes2chunks_dat",
-                              gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.define_component("symbol_mapper_dat",
-                              gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
-        self.define_component("diffenc_dat",
-                              gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.define_component("chunks2symbols_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.define_component("rrc_filter_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-        self.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
-        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
-        self.connect("diffenc", 0, "diffenc_dat", 0)
-        self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
-        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+        self.connect(self.bytes2chunks, gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
+        self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
+        self.connect(self.diffenc, gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
+        self.connect(self.chunks2symbols, gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
+        self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
               
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -295,27 +274,10 @@ class dbpsk_demod(gr.hier_block2):
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
 
-        # Define components
-        self.define_component("pre_scaler", self.pre_scaler)
-        self.define_component("agc", self.agc)
-        self.define_component("rrc_filter", self.rrc_filter)
-        self.define_component("receiver", self.receiver)
-        self.define_component("slicer", self.slicer)
-        self.define_component("diffdec", self.diffdec)
-        self.define_component("symbol_mapper", self.symbol_mapper)
-        self.define_component("unpack", self.unpack)
-
         # Connect and Initialize base class
-        self.connect("self", 0, "pre_scaler", 0)
-        self.connect("pre_scaler", 0, "agc", 0)
-        self.connect("agc", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "receiver", 0)
-        self.connect("receiver", 0, "diffdec", 0)
-        self.connect("diffdec", 0, "slicer", 0)
-        self.connect("slicer", 0, "symbol_mapper", 0)
-        self.connect("symbol_mapper", 0, "unpack", 0)
-        self.connect("unpack", 0, "self", 0)
-        
+	self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
+		     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
+
         if verbose:
             self._print_verbage()
 
@@ -344,32 +306,14 @@ class dbpsk_demod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self.define_component("prescaler_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.define_component("agc_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.define_component("rrc_filter_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.define_component("receiver_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.define_component("diffdec_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))
-        self.define_component("slicer_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.define_component("symbol_mapper_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.define_component("unpack_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-        self.connect("pre_scaler", 0, "prescaler_dat", 0)
-        self.connect("agc", 0, "agc_dat", 0)
-        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-        self.connect("receiver", 0, "receiver_dat", 0)
-        self.connect("diffdec", 0, "diffdec_dat", 0)
-        self.connect("slicer", 0, "slicer_dat", 0)
-        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
-        self.connect("unpack", 0, "unpack_dat", 0)
-
+        self.connect(self.pre_scaler, gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
+        self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
+        self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
+        self.connect(self.receiver, gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
+        self.connect(self.diffdec, gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))
+        self.connect(self.slicer, gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
+        self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
+        self.connect(self.unpack, gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
         
     def add_options(parser):
         """
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
index 04623c93e2..e9fc2092d3 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -114,20 +114,9 @@ class dqpsk_mod(gr.hier_block2):
 
 	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
             
-        # Define components from objects
-        self.define_component("bytes2chunks", self.bytes2chunks)
-        self.define_component("symbol_mapper", self.symbol_mapper)
-        self.define_component("diffenc", self.diffenc)
-        self.define_component("chunks2symbols", self.chunks2symbols)
-        self.define_component("rrc_filter", self.rrc_filter)
-
 	# Connect components
-        self.connect("self", 0, "bytes2chunks", 0)
-        self.connect("bytes2chunks", 0, "symbol_mapper", 0)
-        self.connect("symbol_mapper", 0, "diffenc", 0)
-        self.connect("diffenc", 0, "chunks2symbols", 0)
-        self.connect("chunks2symbols", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "self", 0)
+	self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc, 
+		     self.chunks2symbols, self.rrc_filter, self)
 
         if verbose:
             self._print_verbage()
@@ -150,17 +139,11 @@ class dqpsk_mod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self.define_component("bytes2chunks_dat", gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.define_component("symbol_mapper_dat", gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
-        self.define_component("diffenc_dat", gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.define_component("chunks2symbols_dat", gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.define_component("rrc_filter_dat", gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-        self.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
-        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
-        self.connect("diffenc", 0, "diffenc_dat", 0)
-        self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
-        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+        self.connect(self.bytes2chunks, gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
+        self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
+        self.connect(self.diffenc, gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
+        self.connect(self.chunks2symbols, gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
+        self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
 
     def add_options(parser):
         """
@@ -288,27 +271,10 @@ class dqpsk_demod(gr.hier_block2):
         
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
- 
-        # Define components
-        self.define_component("pre_scaler", self.pre_scaler)
-        self.define_component("agc", self.agc)
-        self.define_component("rrc_filter", self.rrc_filter)
-        self.define_component("receiver", self.receiver)
-        self.define_component("diffdec", self.diffdec)
-        self.define_component("slicer", self.slicer)
-        self.define_component("symbol_mapper", self.symbol_mapper)
-        self.define_component("unpack", self.unpack)
 
         # Connect and Initialize base class
-        self.connect("self", 0, "pre_scaler", 0)
-        self.connect("pre_scaler", 0, "agc", 0)
-        self.connect("agc", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "receiver", 0)
-        self.connect("receiver", 0, "diffdec", 0)
-        self.connect("diffdec", 0, "slicer", 0)
-        self.connect("slicer", 0, "symbol_mapper", 0)
-        self.connect("symbol_mapper", 0, "unpack", 0)
-        self.connect("unpack", 0, "self", 0)
+	self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver, self.diffdec,
+		     self.slicer, self.symbol_mapper, self.unpack, self)
 
         if verbose:
             self._print_verbage()
@@ -338,31 +304,14 @@ class dqpsk_demod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self.define_component("prescaler_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.define_component("agc_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.define_component("rrc_filter_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.define_component("receiver_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.define_component("diffdec_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))
-        self.define_component("slicer_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.define_component("symbol_mapper_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.define_component("unpack_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-        self.connect("pre_scaler", 0, "prescaler_dat", 0)
-        self.connect("agc", 0, "agc_dat", 0)
-        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-        self.connect("receiver", 0, "receiver_dat", 0)
-        self.connect("diffdec", 0, "diffdec_dat", 0)
-        self.connect("slicer", 0, "slicer_dat", 0)
-        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
-        self.connect("unpack", 0, "unpack_dat", 0)
+        self.connect(self.pre_scaler, gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
+        self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
+        self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
+        self.connect(self.receiver, gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
+        self.connect(self.diffdec, gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))
+        self.connect(self.slicer, gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
+        self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
+        self.connect(self.unpack, gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
 
     def add_options(parser):
         """
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
index e852b3c115..bc601e6797 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
@@ -2,7 +2,7 @@
 # GMSK modulation and demodulation.  
 #
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -103,16 +103,8 @@ class gmsk_mod(gr.hier_block2):
 	# FM modulation
 	self.fmmod = gr.frequency_modulator_fc(sensitivity)
 		
-        # Define components from objects
-        self.define_component("nrz", self.nrz)
-        self.define_component("gaussian_filter", self.gaussian_filter)
-        self.define_component("fmmod", self.fmmod)
-
 	# Connect components
-        self.connect("self", 0, "nrz", 0)
-        self.connect("nrz", 0, "gaussian_filter", 0)
-        self.connect("gaussian_filter", 0, "fmmod", 0)
-        self.connect("fmmod", 0, "self", 0)
+	self.connect(self, self.nrz, self.gaussian_filter, self.fmmod, self)
 
         if verbose:
             self._print_verbage()
@@ -135,13 +127,9 @@ class gmsk_mod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self.define_component("nrz_dat", gr.file_sink(gr.sizeof_float, "tx_nrz.dat"))
-        self.define_component("gaussian_filter_dat", gr.file_sink(gr.sizeof_float, "tx_gaussian_filter.dat"))
-        self.define_component("fmmod_dat", gr.file_sink(gr.sizeof_gr_complex, "tx_fmmod.dat"))
-
-        self.connect("nrz", 0, "nrz_dat", 0)
-        self.connect("gaussian_filter", 0, "gaussian_filter_dat", 0)
-        self.connect("fmmod", 0, "fmmod_dat", 0)
+        self.connect(self.nrz, gr.file_sink(gr.sizeof_float, "tx_nrz.dat"))
+        self.connect(self.gaussian_filter, gr.file_sink(gr.sizeof_float, "tx_gaussian_filter.dat"))
+        self.connect(self.fmmod, gr.file_sink(gr.sizeof_gr_complex, "tx_fmmod.dat"))
 
     def add_options(parser):
         """
@@ -232,16 +220,8 @@ class gmsk_demod(gr.hier_block2):
         # slice the floats at 0, outputting 1 bit (the LSB of the output byte) per sample
         self.slicer = gr.binary_slicer_fb()
 
-        # Define components from objects
-        self.define_component("fmdemod", self.fmdemod)
-        self.define_component("clock_recovery", self.clock_recovery)
-        self.define_component("slicer", self.slicer)
-
 	# Connect components
-        self.connect("self", 0, "fmdemod", 0)
-        self.connect("fmdemod", 0, "clock_recovery", 0)
-        self.connect("clock_recovery", 0, "slicer", 0)
-        self.connect("slicer", 0, "self", 0)
+	self.connect(self, self.fmdemod, self.clock_recovery, self.slicer, self)
 
         if verbose:
             self._print_verbage()
@@ -267,13 +247,9 @@ class gmsk_demod(gr.hier_block2):
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self.define_component("fmdemod_dat", gr.file_sink(gr.sizeof_float, "rx_fmdemod.dat"))
-        self.define_component("clock_recovery_dat", gr.file_sink(gr.sizeof_float, "rx_clock_recovery.dat"))
-        self.define_component("slicer_dat", gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-
-        self.connect("fmdemod", 0, "fmdemod_dat", 0)
-        self.connect("clock_recovery", 0, "clock_recovery_dat", 0)
-        self.connect("slicer", 0, "slicer_dat", 0)
+        self.connect(self.fmdemod, gr.file_sink(gr.sizeof_float, "rx_fmdemod.dat"))
+        self.connect(self.clock_recovery, gr.file_sink(gr.sizeof_float, "rx_clock_recovery.dat"))
+        self.connect(self.slicer, gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
 
     def add_options(parser):
         """
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py b/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
index 1e1dae17a4..c94c27338f 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -67,11 +67,7 @@ class mod_pkts(gr.hier_block2):
 
         # accepts messages from the outside world
         self._pkt_input = gr.message_source(gr.sizeof_char, msgq_limit)
-        self.define_component("packet_source", self._pkt_input)
-        self.define_component("modulator", self._modulator)
-
-        self.connect("packet_source", 0, "modulator", 0)
-        self.connect("modulator", 0, "self", 0)
+	self.connect(self._pkt_input, self._modulator, self)
 
     def send_pkt(self, payload='', eof=False):
         """
@@ -136,13 +132,9 @@ class demod_pkts(gr.hier_block2):
 
         self._rcvd_pktq = gr.msg_queue()          # holds packets from the PHY
 
-        self.define_component("demodulator", self._demodulator)
-        self.define_component("correlator", gr.correlate_access_code_bb(access_code, threshold))
-        self.define_component("framer_sink", gr.framer_sink_1(self._rcvd_pktq))
-
-        self.connect("self", 0, "demodulator",0)
-        self.connect("demodulator", 0, "correlator", 0)
-        self.connect("correlator", 0, "framer_sink", 0)
+        self._correlator = gr.correlate_access_code_bb(access_code, threshold)
+        self._framer_sink = gr.framer_sink_1(self._rcvd_pktq)
+	self.connect(self, self._demodulator, self._correlator, self._framer_sink)
 
         self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback)