3 files changed, 35 insertions, 15 deletions
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt
index 9152ee133d..9fdc625280 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/CMakeLists.txt
@@ -36,6 +36,12 @@ GR_PYTHON_INSTALL(
 if(ENABLE_TESTING)
 
 list(APPEND GR_TEST_PYTHON_DIRS
+    ${CMAKE_BINARY_DIR}/gr-blocks/python
+    ${CMAKE_BINARY_DIR}/gr-blocks/swig
+    ${CMAKE_BINARY_DIR}/gr-filter/python
+    ${CMAKE_BINARY_DIR}/gr-filter/swig
+    ${CMAKE_BINARY_DIR}/gr-analog/python
+    ${CMAKE_BINARY_DIR}/gr-analog/swig
     ${CMAKE_BINARY_DIR}/gr-vocoder/python
     ${CMAKE_BINARY_DIR}/gr-vocoder/swig
 )
diff --git a/gr-vocoder/python/cvsd.py b/gr-vocoder/python/cvsd.py
index e9b3ee3054..1c58c33076 100644
--- a/gr-vocoder/python/cvsd.py
+++ b/gr-vocoder/python/cvsd.py
@@ -23,6 +23,16 @@
 from gnuradio import gr
 import vocoder_swig
 
+try:
+    from gnuradio import filter
+except ImportError:
+    import filter_swig as filter
+
+try:
+    from gnuradio import blocks
+except ImportError:
+    import blocks_swig as blocks
+
 class cvsd_encode_fb(gr.hier_block2):
     '''
     This is a wrapper for the CVSD encoder that performs interpolation and filtering
@@ -46,10 +56,10 @@ class cvsd_encode_fb(gr.hier_block2):
         scale_factor = 32000.0
         self.interp = resample
 
-        src_scale = gr.multiply_const_ff(scale_factor)
-        taps = gr.firdes.low_pass(self.interp, self.interp, bw, 2*bw)
-        interp = gr.interp_fir_filter_fff(self.interp, taps)
-        f2s = gr.float_to_short()
+        src_scale = blocks.multiply_const_ff(scale_factor)
+        taps = filter.firdes.low_pass(self.interp, self.interp, bw, 2*bw)
+        interp = filter.interp_fir_filter_fff(self.interp, taps)
+        f2s = blocks.float_to_short()
         enc = vocoder_swig.cvsd_encode_sb()
 
         self.connect(self, src_scale, interp, f2s, enc, self)
@@ -78,9 +88,9 @@ class cvsd_decode_bf(gr.hier_block2):
         self.decim = resample
 
         dec = vocoder_swig.cvsd_decode_bs()
-        s2f = gr.short_to_float()
-        taps = gr.firdes.low_pass(1, 1, bw, 2*bw)
-        decim = gr.fir_filter_fff(self.decim, taps)
-        sink_scale = gr.multiply_const_ff(1.0/scale_factor)
+        s2f = blocks.short_to_float()
+        taps = filter.firdes.low_pass(1, 1, bw, 2*bw)
+        decim = filter.fir_filter_fff(self.decim, taps)
+        sink_scale = blocks.multiply_const_ff(1.0/scale_factor)
 
         self.connect(self, dec, s2f, decim, sink_scale, self)
diff --git a/gr-vocoder/python/qa_cvsd_vocoder.py b/gr-vocoder/python/qa_cvsd_vocoder.py
index 573e6a1302..579b019cc9 100755
--- a/gr-vocoder/python/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/qa_cvsd_vocoder.py
@@ -23,6 +23,8 @@
 from gnuradio import gr, gr_unittest
 from vocoder_swig import *
 from cvsd import *
+import blocks_swig as blocks
+import filter_swig as filter
 
 class test_cvsd_vocoder (gr_unittest.TestCase):
 
@@ -95,20 +97,22 @@ class test_cvsd_vocoder (gr_unittest.TestCase):
                          -0.16035343706607819, 0.014823081903159618,
                          0.16282452642917633, 0.33802291750907898)
 
-        src = gr.sig_source_f(sample_rate, gr.GR_SIN_WAVE, 200, 1, 0)
+        # WARNING: not importing analog in this QA code.
+        # If we enable this, we can probably just create a sin with numpy.
+        src = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 200, 1, 0)
         head = gr.head(gr.sizeof_float, 100)
-        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 = cvsd_vocoder.encode_sb()
         dec = cvsd_vocoder.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 = gr.vector_sink_f()
 
         self.tb.connect(src, src_scale, interp, f2s, enc)