10 files changed, 89 insertions, 46 deletions
diff --git a/gr-audio/examples/python/audio_play.py b/gr-audio/examples/python/audio_play.py
index 465590f69f..94ea72498d 100755
--- a/gr-audio/examples/python/audio_play.py
+++ b/gr-audio/examples/python/audio_play.py
@@ -22,6 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
@@ -45,7 +46,7 @@ class my_top_block(gr.top_block):
             raise SystemExit, 1
 
         sample_rate = int(options.sample_rate)
-        src = gr.file_source (gr.sizeof_float, options.filename, options.repeat)
+        src = blocks.file_source (gr.sizeof_float, options.filename, options.repeat)
         dst = audio.sink (sample_rate, options.audio_output)
         self.connect(src, dst)
 
diff --git a/gr-audio/examples/python/audio_to_file.py b/gr-audio/examples/python/audio_to_file.py
index 3f7a4f8d1c..201ec90bf1 100755
--- a/gr-audio/examples/python/audio_to_file.py
+++ b/gr-audio/examples/python/audio_to_file.py
@@ -22,6 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
@@ -47,7 +48,7 @@ class my_top_block(gr.top_block):
 
         sample_rate = int(options.sample_rate)
         src = audio.source (sample_rate, options.audio_input)
-        dst = gr.file_sink (gr.sizeof_float, filename)
+        dst = blocks.file_sink (gr.sizeof_float, filename)
 
         if options.nsamples is None:
             self.connect((src, 0), dst)
diff --git a/gr-audio/examples/python/dial_tone.py b/gr-audio/examples/python/dial_tone.py
index 5661d13d48..c55d0d38dd 100755
--- a/gr-audio/examples/python/dial_tone.py
+++ b/gr-audio/examples/python/dial_tone.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -25,6 +25,12 @@ from gnuradio import audio
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 class my_top_block(gr.top_block):
 
     def __init__(self):
@@ -35,7 +41,7 @@ class my_top_block(gr.top_block):
                           help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
         parser.add_option("-r", "--sample-rate", type="eng_float", default=48000,
                           help="set sample rate to RATE (48000)")
-        (options, args) = parser.parse_args ()
+        (options, args) = parser.parse_args()
         if len(args) != 0:
             parser.print_help()
             raise SystemExit, 1
@@ -43,12 +49,11 @@ class my_top_block(gr.top_block):
         sample_rate = int(options.sample_rate)
         ampl = 0.1
 
-        src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 350, ampl)
-        src1 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 440, ampl)
-        dst = audio.sink (sample_rate, options.audio_output)
-        self.connect (src0, (dst, 0))
-        self.connect (src1, (dst, 1))
-
+        src0 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 350, ampl)
+        src1 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 440, ampl)
+        dst = audio.sink(sample_rate, options.audio_output)
+        self.connect(src0, (dst, 0))
+        self.connect(src1, (dst, 1))
 
 if __name__ == '__main__':
     try:
diff --git a/gr-audio/examples/python/dial_tone_daemon.py b/gr-audio/examples/python/dial_tone_daemon.py
index b25baebee2..e4dbd95321 100755
--- a/gr-audio/examples/python/dial_tone_daemon.py
+++ b/gr-audio/examples/python/dial_tone_daemon.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -26,6 +26,12 @@ from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import os
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 class my_top_block(gr.top_block):
 
     def __init__(self):
@@ -36,7 +42,7 @@ class my_top_block(gr.top_block):
                           help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
         parser.add_option("-r", "--sample-rate", type="eng_float", default=48000,
                           help="set sample rate to RATE (48000)")
-        (options, args) = parser.parse_args ()
+        (options, args) = parser.parse_args()
         if len(args) != 0:
             parser.print_help()
             raise SystemExit, 1
@@ -44,12 +50,11 @@ class my_top_block(gr.top_block):
         sample_rate = int(options.sample_rate)
         ampl = 0.1
 
-        src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 350, ampl)
-        src1 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 440, ampl)
-        dst = audio.sink (sample_rate, options.audio_output)
-        self.connect (src0, (dst, 0))
-        self.connect (src1, (dst, 1))
-
+        src0 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 350, ampl)
+        src1 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 440, ampl)
+        dst = audio.sink(sample_rate, options.audio_output)
+        self.connect(src0, (dst, 0))
+        self.connect(src1, (dst, 1))
 
 if __name__ == '__main__':
     pid = gru.daemonize()
diff --git a/gr-audio/examples/python/dial_tone_wav.py b/gr-audio/examples/python/dial_tone_wav.py
index c06af55b70..91bf744c95 100755
--- a/gr-audio/examples/python/dial_tone_wav.py
+++ b/gr-audio/examples/python/dial_tone_wav.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -23,9 +23,16 @@
 # GNU Radio example program to record a dial tone to a WAV file
 
 from gnuradio import gr
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 class my_top_block(gr.top_block):
 
     def __init__(self):
@@ -45,11 +52,11 @@ class my_top_block(gr.top_block):
         sample_rate = int(options.sample_rate)
         ampl = 0.1
 
-        src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 350, ampl)
-        src1 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 440, ampl)
+        src0 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 350, ampl)
+        src1 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 440, ampl)
 	head0 = gr.head(gr.sizeof_float, int(options.samples))
 	head1 = gr.head(gr.sizeof_float, int(options.samples))
-	dst = gr.wavfile_sink(args[0], 2, int(options.sample_rate), 16)
+	dst = blocks.wavfile_sink(args[0], 2, int(options.sample_rate), 16)
 
         self.connect(src0, head0, (dst, 0))
         self.connect(src1, head1, (dst, 1))
diff --git a/gr-audio/examples/python/mono_tone.py b/gr-audio/examples/python/mono_tone.py
index bce486e4ab..ad73d62327 100755
--- a/gr-audio/examples/python/mono_tone.py
+++ b/gr-audio/examples/python/mono_tone.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -25,6 +25,12 @@ from gnuradio import audio
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 #import os
 #print os.getpid()
 #raw_input('Attach gdb and press Enter: ')
@@ -50,11 +56,11 @@ class my_top_block(gr.top_block):
         sample_rate = int(options.sample_rate)
         ampl = 0.1
 
-        src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 650, ampl)
+        src0 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 650, ampl)
 
-        dst = audio.sink (sample_rate,
-                          options.audio_output,
-                          options.ok_to_block)
+        dst = audio.sink(sample_rate,
+                         options.audio_output,
+                         options.ok_to_block)
 
         self.connect (src0, (dst, 0))
 
diff --git a/gr-audio/examples/python/multi_tone.py b/gr-audio/examples/python/multi_tone.py
index 00c213b634..6232cbef52 100755
--- a/gr-audio/examples/python/multi_tone.py
+++ b/gr-audio/examples/python/multi_tone.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2006,2007 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -25,6 +25,12 @@ from gnuradio import audio
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 #import os
 #print os.getpid()
 #raw_input('Attach gdb and press Enter: ')
@@ -43,7 +49,7 @@ class my_top_block(gr.top_block):
                            help="set maximum channels to use")
         parser.add_option("-D", "--dont-block", action="store_false", default=True,
                           dest="ok_to_block")
-        (options, args) = parser.parse_args ()
+        (options, args) = parser.parse_args()
         if len(args) != 0:
             parser.print_help()
             raise SystemExit, 1
@@ -69,19 +75,19 @@ class my_top_block(gr.top_block):
         # progression = (7, 11, 1, 5)
         progression = (7, 11, 1, 5, 9)
 
-        dst = audio.sink (sample_rate,
-                          options.audio_output,
-                          options.ok_to_block)
+        dst = audio.sink(sample_rate,
+                         options.audio_output,
+                         options.ok_to_block)
 
         max_chan = dst.input_signature().max_streams()
         if (max_chan == -1) or (max_chan > limit_channels):
             max_chan = limit_channels
 
-        for i in range (max_chan):
-            quo, rem = divmod (i, len (progression))
+        for i in range(max_chan):
+            quo, rem = divmod(i, len (progression))
             freq = base * ratios[progression[rem]] * (quo + 1)
-            src = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, freq, ampl)
-            self.connect (src, (dst, i))
+            src = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, freq, ampl)
+            self.connect(src, (dst, i))
 
 if __name__ == '__main__':
     try:
diff --git a/gr-audio/examples/python/noise.py b/gr-audio/examples/python/noise.py
index 12eee1906d..bba9e83eae 100755
--- a/gr-audio/examples/python/noise.py
+++ b/gr-audio/examples/python/noise.py
@@ -22,6 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import digital
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
@@ -44,7 +45,7 @@ class my_top_block(gr.top_block):
         ampl = 0.1
 
         src = gr.glfsr_source_b(32)     # Pseudorandom noise source
-        b2f = gr.chunks_to_symbols_bf([ampl, -ampl], 1)
+        b2f = digital.chunks_to_symbols_bf([ampl, -ampl], 1)
         dst = audio.sink(sample_rate, options.audio_output)
         self.connect(src, b2f, dst)
 
diff --git a/gr-audio/examples/python/spectrum_inversion.py b/gr-audio/examples/python/spectrum_inversion.py
index e152430cdb..63d0c8cc8d 100755
--- a/gr-audio/examples/python/spectrum_inversion.py
+++ b/gr-audio/examples/python/spectrum_inversion.py
@@ -28,6 +28,7 @@
 
 from gnuradio import gr
 from gnuradio import audio
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
@@ -54,7 +55,7 @@ class my_top_block(gr.top_block):
 
 	vec1 = [1, -1]
 	vsource = gr.vector_source_f(vec1, True)
-	multiply = gr.multiply_ff()
+	multiply = blocks.multiply_ff()
 
 	self.connect(src, (multiply, 0))
 	self.connect(vsource, (multiply, 1))
diff --git a/gr-audio/examples/python/test_resampler.py b/gr-audio/examples/python/test_resampler.py
index db7f79fba0..0f5544cfa9 100755
--- a/gr-audio/examples/python/test_resampler.py
+++ b/gr-audio/examples/python/test_resampler.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -20,11 +20,22 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gru, blks2
+from gnuradio import gr, gru
 from gnuradio import audio
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
+try:
+    from gnuradio import blocks
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-blocks.\n")
+    sys.exit(1)
 
 class my_top_block(gr.top_block):
 
@@ -38,7 +49,7 @@ class my_top_block(gr.top_block):
                           help="set input sample rate to RATE (%default)")
         parser.add_option("-o", "--output-rate", type="eng_float", default=48000,
                           help="set output sample rate to RATE (%default)")
-        (options, args) = parser.parse_args ()
+        (options, args) = parser.parse_args()
         if len(args) != 0:
             parser.print_help()
             raise SystemExit, 1
@@ -53,11 +64,10 @@ class my_top_block(gr.top_block):
         print "decim  =", decim
 
         ampl = 0.1
-        src0 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 650, ampl)
-        rr = blks2.rational_resampler_fff(interp, decim)
-        dst = audio.sink (output_rate, options.audio_output)
-        self.connect (src0, rr, (dst, 0))
-
+        src0 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 650, ampl)
+        rr = blocks.rational_resampler_fff(interp, decim)
+        dst = audio.sink(output_rate, options.audio_output)
+        self.connect(src0, rr, (dst, 0))
 
 if __name__ == '__main__':
     try: