8 files changed, 44 insertions, 35 deletions
diff --git a/gr-vocoder/examples/alaw_audio_loopback.py b/gr-vocoder/examples/alaw_audio_loopback.py
index ad686244b..5b800b5bf 100755
--- a/gr-vocoder/examples/alaw_audio_loopback.py
+++ b/gr-vocoder/examples/alaw_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.alaw_encode_sb()
     dec = vocoder.alaw_decode_bs()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
diff --git a/gr-vocoder/examples/codec2_audio_loopback.py b/gr-vocoder/examples/codec2_audio_loopback.py
index f5da9c217..bf95f39ce 100755
--- a/gr-vocoder/examples/codec2_audio_loopback.py
+++ b/gr-vocoder/examples/codec2_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.codec2_encode_sp()
     dec = vocoder.codec2_decode_ps()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
diff --git a/gr-vocoder/examples/cvsd_audio_loopback.py b/gr-vocoder/examples/cvsd_audio_loopback.py
index f101fecb4..ef4c6ded2 100755
--- a/gr-vocoder/examples/cvsd_audio_loopback.py
+++ b/gr-vocoder/examples/cvsd_audio_loopback.py
@@ -20,8 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, blks2
+from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
+from gnuradio import filter
 from gnuradio import vocoder
 
 def build_graph():
@@ -30,18 +32,18 @@ def build_graph():
 
     tb = gr.top_block()
     src = audio.source(sample_rate, "plughw:0,0")
-    src_scale = gr.multiply_const_ff(scale_factor)
+    src_scale = blocks.multiply_const_ff(scale_factor)
 
-    interp = blks2.rational_resampler_fff(8, 1)
-    f2s = gr.float_to_short ()
+    interp = filter.rational_resampler_fff(8, 1)
+    f2s = blocks.float_to_short()
 
     enc = vocoder.cvsd_encode_sb()
     dec = vocoder.cvsd_decode_bs()
 
-    s2f = gr.short_to_float ()
-    decim = blks2.rational_resampler_fff(1, 8)
+    s2f = blocks.short_to_float()
+    decim = filter.rational_resampler_fff(1, 8)
 
-    sink_scale = gr.multiply_const_ff(1.0/scale_factor)
+    sink_scale = blocks.multiply_const_ff(1.0/scale_factor)
     sink = audio.sink(sample_rate, "plughw:0,0")
 
     tb.connect(src, src_scale, interp, f2s, enc)
diff --git a/gr-vocoder/examples/g721_audio_loopback.py b/gr-vocoder/examples/g721_audio_loopback.py
index 339ea79ad..42abbabf6 100755
--- a/gr-vocoder/examples/g721_audio_loopback.py
+++ b/gr-vocoder/examples/g721_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.g721_encode_sb()
     dec = vocoder.g721_decode_bs()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
diff --git a/gr-vocoder/examples/g723_24_audio_loopback.py b/gr-vocoder/examples/g723_24_audio_loopback.py
index 34d9ddd5d..cade33f29 100755
--- a/gr-vocoder/examples/g723_24_audio_loopback.py
+++ b/gr-vocoder/examples/g723_24_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.g723_24_encode_sb()
     dec = vocoder.g723_24_decode_bs()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
diff --git a/gr-vocoder/examples/g723_40_audio_loopback.py b/gr-vocoder/examples/g723_40_audio_loopback.py
index c636d82d1..77e40884c 100755
--- a/gr-vocoder/examples/g723_40_audio_loopback.py
+++ b/gr-vocoder/examples/g723_40_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.g723_40_encode_sb()
     dec = vocoder.g723_40_decode_bs()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
diff --git a/gr-vocoder/examples/gsm_audio_loopback.py b/gr-vocoder/examples/gsm_audio_loopback.py
index ba0fcb847..5d5bf9dd7 100755
--- a/gr-vocoder/examples/gsm_audio_loopback.py
+++ b/gr-vocoder/examples/gsm_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.gsm_fr_encode_sp()
     dec = vocoder.gsm_fr_decode_ps()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
diff --git a/gr-vocoder/examples/ulaw_audio_loopback.py b/gr-vocoder/examples/ulaw_audio_loopback.py
index e7a96d367..9f0617622 100755
--- a/gr-vocoder/examples/ulaw_audio_loopback.py
+++ b/gr-vocoder/examples/ulaw_audio_loopback.py
@@ -22,17 +22,18 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
-    src_scale = gr.multiply_const_ff(32767)
-    f2s = gr.float_to_short ()
+    src_scale = blocks.multiply_const_ff(32767)
+    f2s = blocks.float_to_short()
     enc = vocoder.ulaw_encode_sb()
     dec = vocoder.ulaw_decode_bs()
-    s2f = gr.short_to_float ()
-    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    s2f = blocks.short_to_float()
+    sink_scale = blocks.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
     tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb