From 55d3e4a47958be287648a2021f7e92d81086b2d9 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 21 Dec 2012 15:11:39 -0500
Subject: blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
---
gr-uhd/examples/python/fm_tx4.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'gr-uhd/examples/python/fm_tx4.py')
diff --git a/gr-uhd/examples/python/fm_tx4.py b/gr-uhd/examples/python/fm_tx4.py
index ae3e1b94f3..e4cf3ded24 100755
--- a/gr-uhd/examples/python/fm_tx4.py
+++ b/gr-uhd/examples/python/fm_tx4.py
@@ -35,6 +35,7 @@ audio_to_file.py
from gnuradio import gr, eng_notation
from gnuradio import uhd
from gnuradio import analog
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import math
@@ -70,7 +71,7 @@ class pipeline(gr.hier_block2):
lo_freq, # frequency
1.0, # amplitude
0) # DC Offset
- mixer = gr.multiply_cc()
+ mixer = blocks.multiply_cc()
self.connect(src, fmtx, (mixer, 0))
self.connect(lo, (mixer, 1))
@@ -141,7 +142,7 @@ class fm_tx_block(stdgui2.std_top_block):
self.set_gain(options.gain)
self.set_freq(options.freq)
- self.sum = gr.add_cc ()
+ self.sum = blocks.add_cc ()
# Instantiate N NBFM channels
step = 25e3
@@ -153,7 +154,7 @@ class fm_tx_block(stdgui2.std_top_block):
self.audio_rate, self.usrp_rate)
self.connect(t, (self.sum, i))
- self.gain = gr.multiply_const_cc (1.0 / options.nchannels)
+ self.gain = blocks.multiply_const_cc (1.0 / options.nchannels)
# connect it all
self.connect (self.sum, self.gain)
--
cgit v1.2.3