3 files changed, 31 insertions, 27 deletions
diff --git a/gnuradio-core/src/examples/mp-sched/affinity_set.py b/gnuradio-core/src/examples/mp-sched/affinity_set.py
index d73d4fc428..7c53c51d89 100755
--- a/gnuradio-core/src/examples/mp-sched/affinity_set.py
+++ b/gnuradio-core/src/examples/mp-sched/affinity_set.py
@@ -6,8 +6,10 @@
 
 from gnuradio import eng_notation
 from gnuradio import gr
+from gnuradio import blocks
+from gnuradio import filter
 from gnuradio.eng_option import eng_option
-from gnuradio.gr import firdes
+from gnuradio.filter import firdes
 from optparse import OptionParser
 import sys
 
@@ -25,22 +27,22 @@ class affinity_set(gr.top_block):
 	# Blocks
 	##################################################
         vec_len = 1
-	self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*vec_len, samp_rate)
-	self.gr_null_source_0 = gr.null_source(gr.sizeof_gr_complex*vec_len)
-	self.gr_null_sink_0 = gr.null_sink(gr.sizeof_gr_complex*vec_len)
-	self.gr_filt_0 = gr.fir_filter_ccc(1, 40000*[0.2+0.3j,])
-	self.gr_filt_1 = gr.fir_filter_ccc(1, 40000*[0.2+0.3j,])
+	self.blocks_throttle_0 = blocks.throttle(gr.sizeof_gr_complex*vec_len, samp_rate)
+	self.blocks_null_source_0 = blocks.null_source(gr.sizeof_gr_complex*vec_len)
+	self.blocks_null_sink_0 = blocks.null_sink(gr.sizeof_gr_complex*vec_len)
+	self.filter_filt_0 = filter.fir_filter_ccc(1, 40000*[0.2+0.3j,])
+	self.filter_filt_1 = filter.fir_filter_ccc(1, 40000*[0.2+0.3j,])
 
-	self.gr_filt_0.set_processor_affinity([0,])
-	self.gr_filt_1.set_processor_affinity([0,1])
+	self.filter_filt_0.set_processor_affinity([0,])
+	self.filter_filt_1.set_processor_affinity([0,1])
 		
 	##################################################
 	# Connections
 	##################################################
-	self.connect((self.gr_null_source_0, 0), (self.gr_throttle_0, 0))
-	self.connect((self.gr_throttle_0, 0), (self.gr_filt_0, 0))
-	self.connect((self.gr_filt_0, 0), (self.gr_filt_1, 0))
-	self.connect((self.gr_filt_1, 0), (self.gr_null_sink_0, 0))
+	self.connect((self.blocks_null_source_0, 0), (self.blocks_throttle_0, 0))
+	self.connect((self.blocks_throttle_0, 0), (self.gr_filt_0, 0))
+	self.connect((self.filter_filt_0, 0), (self.gr_filt_1, 0))
+	self.connect((self.filter_filt_1, 0), (self.blocks_null_sink_0, 0))
 
     def get_samp_rate(self):
         return self.samp_rate
diff --git a/gnuradio-core/src/examples/mp-sched/synthetic.py b/gnuradio-core/src/examples/mp-sched/synthetic.py
index 5ce1b5eb89..6f0bb85da8 100755
--- a/gnuradio-core/src/examples/mp-sched/synthetic.py
+++ b/gnuradio-core/src/examples/mp-sched/synthetic.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -20,6 +20,7 @@
 #
 
 from gnuradio import gr, gru, eng_notation, blks2
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import os
@@ -28,8 +29,8 @@ import os
 class pipeline(gr.hier_block2):
     def __init__(self, nstages, ntaps=256):
         """
-        Create a pipeline of nstages of gr.fir_filter_fff's connected in serial
-        terminating in a gr.null_sink.
+        Create a pipeline of nstages of filter.fir_filter_fff's connected in serial
+        terminating in a blocks.null_sink.
         """
         gr.hier_block2.__init__(self, "pipeline",
                                 gr.io_signature(1, 1, gr.sizeof_float),
@@ -37,11 +38,11 @@ class pipeline(gr.hier_block2):
         taps = ntaps*[1.0/ntaps]
         upstream = self
         for i in range(nstages):
-            op = gr.fir_filter_fff(1, taps)
+            op = filter.fir_filter_fff(1, taps)
             self.connect(upstream, op)
             upstream = op
 
-        self.connect(upstream, gr.null_sink(gr.sizeof_float))
+        self.connect(upstream, blocks.null_sink(gr.sizeof_float))
 
 
 class top(gr.top_block):
@@ -75,8 +76,8 @@ class top(gr.top_block):
         # Something vaguely like floating point ops
         self.flop = 2 * ntaps * options.npipelines * options.nstages * options.nsamples
 
-        src = gr.null_source(gr.sizeof_float)
-        head = gr.head(gr.sizeof_float, int(options.nsamples))
+        src = blocks.null_source(gr.sizeof_float)
+        head = blocks.head(gr.sizeof_float, int(options.nsamples))
         self.connect(src, head)
 
         for n in range(options.npipelines):
diff --git a/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py b/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py
index 81613922b8..7cf3210b0e 100755
--- a/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py
+++ b/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py
@@ -22,7 +22,8 @@
 
 from gnuradio import gr, gru, eng_notation, optfir
 from gnuradio import audio
-from gnuradio import blks2
+from gnuradio import analog
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import sys
@@ -49,7 +50,7 @@ class wfm_rx_block (gr.top_block):
 
         # build graph
 
-        self.src = gr.file_source(gr.sizeof_gr_complex, input_filename, False)
+        self.src = blocks.file_source(gr.sizeof_gr_complex, input_filename, False)
 
         adc_rate = 64e6                             # 64 MS/s
         usrp_decim = 200
@@ -67,19 +68,19 @@ class wfm_rx_block (gr.top_block):
                                             0.1,         # passband ripple
                                             60)          # stopband attenuation
         #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
+        chan_filt = filter.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
 
 
-        #self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-        self.guts = blks2.wfm_rcv_pll (demod_rate, audio_decimation)
+        #self.guts = analog.wfm_rcv (demod_rate, audio_decimation)
+        self.guts = analog.wfm_rcv_pll (demod_rate, audio_decimation)
 
         # FIXME rework {add,multiply}_const_* to handle multiple streams
-        self.volume_control_l = gr.multiply_const_ff(self.vol)
-        self.volume_control_r = gr.multiply_const_ff(self.vol)
+        self.volume_control_l = blocks.multiply_const_ff(self.vol)
+        self.volume_control_r = blocks.multiply_const_ff(self.vol)
 
         # wave file as final sink
         if 1:
-            sink = gr.wavfile_sink(output_filename, 2, int(audio_rate), 16)
+            sink = blocks.wavfile_sink(output_filename, 2, int(audio_rate), 16)
         else:
             sink = audio.sink (int (audio_rate),
                                options.audio_output,