[Commit-gnuradio] r6448 - gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl

[jcorgan]

Author: jcorgan
Date: 2007-09-15 12:10:46 -0600 (Sat, 15 Sep 2007)
New Revision: 6448

Modified:
   
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/wfm_tx.py
Log:
Converted wfm_tx from hier_block to hier_block2.  No in-tree code uses this 
block, so untested.

Modified: 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/wfm_tx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/wfm_tx.py
     2007-09-15 18:03:29 UTC (rev 6447)
+++ 
gnuradio/branches/developers/jcorgan/t162/gnuradio-core/src/python/gnuradio/blks2impl/wfm_tx.py
     2007-09-15 18:10:46 UTC (rev 6448)
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,17 +21,16 @@
 
 import math
 from gnuradio import gr, optfir
-from gnuradio.blksimpl.fm_emph import fm_preemph
+from gnuradio.blks2impl.fm_emph import fm_preemph
 
-class wfm_tx(gr.hier_block):
-    def __init__(self, fg, audio_rate, quad_rate, tau=75e-6, max_dev=75e3):
+class wfm_tx(gr.hier_block2):
+    def __init__(self, audio_rate, quad_rate, tau=75e-6, max_dev=75e3):
         """
         Wide Band FM Transmitter.
 
         Takes a single float input stream of audio samples in the range [-1,+1]
         and produces a single FM modulated complex baseband output.
 
-        @param fg: flow graph
         @param audio_rate: sample rate of audio stream, >= 16k
         @type audio_rate: integer
         @param quad_rate: sample rate of output stream
@@ -43,6 +42,9 @@
 
         quad_rate must be an integer multiple of audio_rate.
         """
+       gr.hier_block2.__init__(self, "wfm_tx",
+                               gr.io_signature(1, 1, gr.sizeof_float),      # 
Input signature
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex)) # 
Output signature
         
         # FIXME audio_rate and quad_rate ought to be exact rationals
         audio_rate = int(audio_rate)
@@ -66,14 +68,12 @@
             print "len(interp_taps) =", len(interp_taps)
             self.interpolator = gr.interp_fir_filter_fff (interp_factor, 
interp_taps)
 
-        self.preemph = fm_preemph (fg, quad_rate, tau=tau)
+        self.preemph = fm_preemph (quad_rate, tau=tau)
         
         k = 2 * math.pi * max_dev / quad_rate
         self.modulator = gr.frequency_modulator_fc (k)
 
         if do_interp:
-            fg.connect (self.interpolator, self.preemph, self.modulator)
-            gr.hier_block.__init__(self, fg, self.interpolator, self.modulator)
+            self.connect (self, self.interpolator, self.preemph, 
self.modulator, self)
         else:
-            fg.connect(self.preemph, self.modulator)
-            gr.hier_block.__init__(self, fg, self.preemph, self.modulator)
+            self.connect(self, self.preemph, self.modulator, self)