16 files changed, 116 insertions, 84 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt
index 26f99a1573..10a7904b20 100644
--- a/gr-atsc/CMakeLists.txt
+++ b/gr-atsc/CMakeLists.txt
@@ -29,6 +29,10 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC
     Boost_FOUND
     ENABLE_GR_CORE
+    ENABLE_GR_FFT
+    ENABLE_GR_BLOCKS
+    ENABLE_GR_FILTER
+    ENABLE_GR_ANALOG
 )
 
 GR_SET_GLOBAL(GR_ATSC_INCLUDE_DIRS
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt
index 86c0be4430..52375eef2f 100644
--- a/gr-atsc/src/lib/CMakeLists.txt
+++ b/gr-atsc/src/lib/CMakeLists.txt
@@ -21,8 +21,11 @@
 # Setup the include and linker paths
 ########################################################################
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_ATSC_INCLUDE_DIRS}
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${GR_ANALOG_INCLUDE_DIRS}
+    ${GR_FEC_INCLUDE_DIRS}
+    ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -113,7 +116,11 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND atsc_libs
+    gnuradio-filter
+    gnuradio-analog
     gnuradio-core
+    gnuradio-fec
+    gnuradio-blocks
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
@@ -148,7 +155,7 @@ list(APPEND test_atsci_sources
 )
 
 include(GrTest)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft)
 add_executable(test_atsci ${test_atsci_sources} test_atsci.cc)
 target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES})
 GR_ADD_TEST(atsci-test test_atsci)
@@ -225,6 +232,9 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_ATSC_INCLUDE_DIRS}
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${GR_ANALOG_INCLUDE_DIRS}
+    ${GR_FEC_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h
index 0474b8f766..28912df37d 100644
--- a/gr-atsc/src/lib/atsc_fpll.h
+++ b/gr-atsc/src/lib/atsc_fpll.h
@@ -24,12 +24,14 @@
 
 #include <atsc_api.h>
 #include <gr_sync_block.h>
-#include <gr_nco.h>
-#include <gr_single_pole_iir.h>
-#include <gri_agc_ff.h>
+#include <blocks/nco.h>
+#include <filter/single_pole_iir.h>
+#include <analog/agc.h>
 #include <stdio.h>
 #include <atsci_diag_output.h>
 
+using namespace gr;
+
 class atsc_fpll;
 typedef boost::shared_ptr<atsc_fpll> atsc_fpll_sptr;
 
@@ -67,10 +69,10 @@ public:
   double                        initial_freq;
   double                        initial_phase;
   bool                          debug_no_update;
-  gr_nco<float,float>           nco;
-  gri_agc_ff                    agc;    // automatic gain control
-  gr_single_pole_iir<float,float,float> afci;
-  gr_single_pole_iir<float,float,float> afcq;
+  blocks::nco<float,float>      nco;
+  analog::kernel::agc_ff        agc;    // automatic gain control
+  filter::single_pole_iir<float,float,float> afci;
+  filter::single_pole_iir<float,float,float> afcq;
 
 
 };
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.cc b/gr-atsc/src/lib/atsci_reed_solomon.cc
index a4a40e3f17..8ac97344b4 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.cc
+++ b/gr-atsc/src/lib/atsci_reed_solomon.cc
@@ -25,7 +25,7 @@
 #include <string.h>
 
 extern "C" {
-#include "rs.h"
+#include <fec/rs.h>
 }
 
 static const int rs_init_symsize =     8;
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.cc b/gr-atsc/src/lib/atsci_root_raised_cosine.cc
index f555d90ac6..3323ca89ea 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine.cc
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine.cc
@@ -22,7 +22,7 @@
 
 #include <atsc_consts.h>
 #include <atsci_root_raised_cosine.h>
-#include <gr_firdes.h>
+#include <filter/firdes.h>
 
 vector<float>
 atsc_root_raised_cosine::taps (double sampling_rate)
@@ -32,5 +32,5 @@ atsc_root_raised_cosine::taps (double sampling_rate)
   // static const int    NTAPS = 745;			// better number
   static const int    NTAPS = 279;			// better number
 
-  return gr_firdes::root_raised_cosine (1.0, sampling_rate, symbol_rate, .115, NTAPS);
+  return gr::filter::firdes::root_raised_cosine(1.0, sampling_rate, symbol_rate, .115, NTAPS);
 }
diff --git a/gr-atsc/src/lib/atsci_sssr.h b/gr-atsc/src/lib/atsci_sssr.h
index f3b825b3c4..1eb626eb18 100644
--- a/gr-atsc/src/lib/atsci_sssr.h
+++ b/gr-atsc/src/lib/atsci_sssr.h
@@ -29,8 +29,8 @@
 
 #include <atsc_api.h>
 #include <atsc_consts.h>
-#include <gri_mmse_fir_interpolator.h>
-#include <gr_single_pole_iir.h>
+#include <filter/mmse_fir_interpolator_ff.h>
+#include <filter/single_pole_iir.h>
 #include <cstdio>
 
 /*
@@ -195,8 +195,8 @@ public:
  */
 
 class ATSC_API atsci_interpolator {
-  gri_mmse_fir_interpolator	d_interp;
-  gr_single_pole_iir<float,float,float> d_loop;	// ``VCO'' loop filter
+  gr::filter::mmse_fir_interpolator_ff d_interp;
+  gr::filter::single_pole_iir<float,float,float> d_loop; // ``VCO'' loop filter
   double			d_nominal_ratio_of_rx_clock_to_symbol_freq; // FREQ
   double			d_w;	// ratio of PERIOD of Tx to Rx clocks
   double			d_mu;	// fractional delay [0,1]
diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt
index fa9f91156b..aaa5bd93c4 100644
--- a/gr-atsc/src/python/CMakeLists.txt
+++ b/gr-atsc/src/python/CMakeLists.txt
@@ -46,8 +46,10 @@ if(ENABLE_TESTING)
 
 list(APPEND GR_TEST_PYTHON_DIRS
     ${CMAKE_BINARY_DIR}/gr-atsc/src/lib
+    ${CMAKE_BINARY_DIR}/gr-blocks/python
+    ${CMAKE_BINARY_DIR}/gr-blocks/swig
 )
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft)
 
 include(GrTest)
 file(GLOB py_qa_test_files "qa_*.py")
diff --git a/gr-atsc/src/python/all_atsc.py b/gr-atsc/src/python/all_atsc.py
index 0137839bdc..7cac785149 100644
--- a/gr-atsc/src/python/all_atsc.py
+++ b/gr-atsc/src/python/all_atsc.py
@@ -33,6 +33,8 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr, atsc
+from gnuradio import filter
+from gnuradio import blocks
 import sys, os, math
 
 def graph (args):
@@ -47,25 +49,25 @@ def graph (args):
     tb = gr.top_block ()
 
     # Convert to a from shorts to a stream of complex numbers.
-    srcf = gr.file_source (gr.sizeof_short,infile)
-    s2ss = gr.stream_to_streams(gr.sizeof_short,2)
-    s2f1 = gr.short_to_float()
-    s2f2 = gr.short_to_float()
-    src0 = gr.float_to_complex()
+    srcf = blocks.file_source (gr.sizeof_short,infile)
+    s2ss = blocks.stream_to_streams(gr.sizeof_short,2)
+    s2f1 = blocks.short_to_float()
+    s2f2 = blocks.short_to_float()
+    src0 = blocks.float_to_complex()
     tb.connect(srcf, s2ss)
     tb.connect((s2ss, 0), s2f1, (src0, 0))
     tb.connect((s2ss, 1), s2f2, (src0, 1))
 
     # Low pass filter it and increase sample rate by a factor of 3.
-    lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING )
-    lp = gr.interp_fir_filter_ccf ( 3, lp_coeffs )
+    lp_coeffs = filter.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, filter.firdes.WIN_HAMMING )
+    lp = filter.interp_fir_filter_ccf ( 3, lp_coeffs )
     tb.connect(src0, lp)
 
     # Upconvert it.
-    duc_coeffs = gr.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, gr.firdes.WIN_HAMMING )
-    duc = gr.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, 5.75e6, 19.2e6 )
+    duc_coeffs = filter.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, filter.firdes.WIN_HAMMING )
+    duc = filter.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, 5.75e6, 19.2e6 )
     # Discard the imaginary component.
-    c2f = gr.complex_to_float()
+    c2f = blocks.complex_to_float()
     tb.connect(lp, duc, c2f)
 
     # Frequency Phase Lock Loop
@@ -74,7 +76,7 @@ def graph (args):
     # 1/2 as wide because we're designing lp filter
     symbol_rate = atsc.ATSC_SYMBOL_RATE/2.
     NTAPS = 279
-    tt = gr.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
+    tt = filter.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
     # heterodyne the low pass coefficients up to the specified bandpass
     # center frequency.  Note that when we do this, the filter bandwidth
     # is effectively twice the low pass (2.69 * 2 = 5.38) and hence
@@ -83,7 +85,7 @@ def graph (args):
     t=[]
     for i in range(len(tt)):
         t += [tt[i] * 2. * math.cos(arg * i)]
-    rrc = gr.fir_filter_fff(1, t)
+    rrc = filter.fir_filter_fff(1, t)
 
     fpll = atsc.fpll()
 
@@ -91,17 +93,17 @@ def graph (args):
     lower_edge = 6e6 - 0.31e6
     upper_edge = IF_freq - 3e6 + pilot_freq
     transition_width = upper_edge - lower_edge
-    lp_coeffs = gr.firdes.low_pass (1.0,
-                                    input_rate,
-                                    (lower_edge + upper_edge) * 0.5,
-                                    transition_width,
-                                    gr.firdes.WIN_HAMMING);
+    lp_coeffs = filter.firdes.low_pass(1.0,
+                                       input_rate,
+                                       (lower_edge + upper_edge) * 0.5,
+                                       transition_width,
+                                       filter.firdes.WIN_HAMMING);
     
-    lp_filter = gr.fir_filter_fff (1,lp_coeffs)
+    lp_filter = filter.fir_filter_fff(1,lp_coeffs)
     
     alpha = 1e-5
-    iir = gr.single_pole_iir_filter_ff(alpha)
-    remove_dc = gr.sub_ff()
+    iir = filter.single_pole_iir_filter_ff(alpha)
+    remove_dc = blocks.sub_ff()
 
     tb.connect(c2f, fpll, lp_filter)
     tb.connect(lp_filter, iir)
@@ -126,10 +128,10 @@ def graph (args):
     rs_dec = atsc.rs_decoder()
     derand = atsc.derandomizer()
     depad = atsc.depad()
-    dst = gr.file_sink(gr.sizeof_char, outfile)
+    dst = blocks.file_sink(gr.sizeof_char, outfile)
     tb.connect(fsd, viterbi, deinter, rs_dec, derand, depad, dst)
 
-    dst2 = gr.file_sink(gr.sizeof_gr_complex, "atsc_complex.data")
+    dst2 = blocks.file_sink(gr.sizeof_gr_complex, "atsc_complex.data")
     tb.connect(src0, dst2)
 
     tb.run ()
diff --git a/gr-atsc/src/python/atsc_utils.py b/gr-atsc/src/python/atsc_utils.py
index fced6d1902..fc2465bed2 100644
--- a/gr-atsc/src/python/atsc_utils.py
+++ b/gr-atsc/src/python/atsc_utils.py
@@ -28,7 +28,8 @@ def make_fake_transport_stream_packet(npkts):
     """
     Return a sequence of 8-bit ints that represents an MPEG Transport Stream packet.
 
-    @param npkts: how many 188-byte packets to return
+    Args:
+        npkts: how many 188-byte packets to return
 
     FYI, each ATSC Data Frame contains two Data Fields, each of which contains
     312 data segments.  Each transport stream packet maps to a data segment.
diff --git a/gr-atsc/src/python/btl-fsd.py b/gr-atsc/src/python/btl-fsd.py
index 826e71016c..6bcab3dce3 100755
--- a/gr-atsc/src/python/btl-fsd.py
+++ b/gr-atsc/src/python/btl-fsd.py
@@ -22,6 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import atsc
+from gnuradio import blocks
 import os
 
 print os.getpid()
@@ -33,9 +34,9 @@ fsc = atsc.fs_checker()
 eq = atsc.equalizer()
 fsd = atsc.field_sync_demux()
 
-out_data = gr.file_sink(atsc.sizeof_atsc_soft_data_segment,"/tmp/atsc_pipe_5")
+out_data = blocks.file_sink(atsc.sizeof_atsc_soft_data_segment,"/tmp/atsc_pipe_5")
 
-inp = gr.file_source(gr.sizeof_float,"/tmp/atsc_pipe_3")
+inp = blocks.file_source(gr.sizeof_float,"/tmp/atsc_pipe_3")
 
 tb.connect(inp,btl)
 tb.connect((btl,0),(fsc,0),(eq,0),(fsd,0))
diff --git a/gr-atsc/src/python/fpll.py b/gr-atsc/src/python/fpll.py
index aed975557a..dee81da13d 100755
--- a/gr-atsc/src/python/fpll.py
+++ b/gr-atsc/src/python/fpll.py
@@ -21,6 +21,8 @@
 #
 
 from gnuradio import gr, atsc
+from gnuradio import blocks
+from gnuradio import filter
 import math, os
 
 def main():
@@ -29,7 +31,7 @@ def main():
 
 	tb = gr.top_block()
 
-        u = gr.file_source(gr.sizeof_float,"/tmp/atsc_pipe_2")
+        u = blocks.file_source(gr.sizeof_float,"/tmp/atsc_pipe_2")
 
         input_rate = 19.2e6
 	IF_freq = 5.75e6
@@ -38,7 +40,7 @@ def main():
 	# 1/2 as wide because we're designing lp filter
 	symbol_rate = atsc.ATSC_SYMBOL_RATE/2.
 	NTAPS = 279
-	tt = gr.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
+	tt = filter.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
   # heterodyne the low pass coefficients up to the specified bandpass
   # center frequency.  Note that when we do this, the filter bandwidth
   # is effectively twice the low pass (2.69 * 2 = 5.38) and hence
@@ -47,7 +49,7 @@ def main():
 	t=[]
 	for i in range(len(tt)):
 	  t += [tt[i] * 2. * math.cos(arg * i)]
-	rrc = gr.fir_filter_fff(1, t)
+	rrc = filter.fir_filter_fff(1, t)
 
 	fpll = atsc.fpll()
 
@@ -55,20 +57,20 @@ def main():
 	lower_edge = 6e6 - 0.31e6
 	upper_edge = IF_freq - 3e6 + pilot_freq
 	transition_width = upper_edge - lower_edge
-	lp_coeffs = gr.firdes.low_pass (1.0,
+	lp_coeffs = filter.firdes.low_pass (1.0,
 			   input_rate,
 			   (lower_edge + upper_edge) * 0.5,
                            transition_width,
-                           gr.firdes.WIN_HAMMING);
+                           filter.firdes.WIN_HAMMING);
 
-	lp_filter = gr.fir_filter_fff (1,lp_coeffs)
+	lp_filter = filter.fir_filter_fff (1,lp_coeffs)
 
 	alpha = 1e-5
-	iir = gr.single_pole_iir_filter_ff(alpha)
-	remove_dc = gr.sub_ff()
+	iir = filter.single_pole_iir_filter_ff(alpha)
+	remove_dc = blocks.sub_ff()
 
-	out = gr.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_3")
-	# out = gr.file_sink(gr.sizeof_float,"/mnt/sata/atsc_data_float")
+	out = blocks.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_3")
+	# out = blocks.file_sink(gr.sizeof_float,"/mnt/sata/atsc_data_float")
 
         tb.connect(u, fpll, lp_filter)
 	tb.connect(lp_filter, iir)
diff --git a/gr-atsc/src/python/interp.py b/gr-atsc/src/python/interp.py
index 8a3cc8d4c5..ee2d234892 100755
--- a/gr-atsc/src/python/interp.py
+++ b/gr-atsc/src/python/interp.py
@@ -32,33 +32,35 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr
+from gnuradio import blocks
 import sys
 
-def graph (args):
+def graph(args):
 
-    nargs = len (args)
+    nargs = len(args)
     if nargs == 1:
 	infile = args[0]
     else:
 	sys.stderr.write('usage: interp.py input_file\n')
-	sys.exit (1)
+	sys.exit(1)
 
-    tb = gr.top_block ()
+    tb = gr.top_block()
 
-    src0 = gr.file_source (gr.sizeof_gr_complex,infile)
+    src0 = blocks.file_source(gr.sizeof_gr_complex, infile)
 
-    lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING )
-    lp = gr.interp_fir_filter_ccf ( 1, lp_coeffs )
+    lp_coeffs = filter.firdes.low_pass(3, 19.2e6, 3.2e6, .5e6,
+                                       filter.firdes.WIN_HAMMING )
+    lp = filter.interp_fir_filter_ccf(1, lp_coeffs)
 
-    file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
+    file = blocks.file_sink(gr.sizeof_gr_complex, "/tmp/atsc_pipe_1")
 
-    tb.connect( src0, lp, file )
+    tb.connect(src0, lp, file)
 
     tb.start()
-    raw_input ('Head End: Press Enter to stop')
+    raw_input('Head End: Press Enter to stop')
     tb.stop()
 
 if __name__ == '__main__':
-    graph (sys.argv[1:])
+    graph(sys.argv[1:])
 
 
diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py
index c5ea337f9a..d07b941c12 100755
--- a/gr-atsc/src/python/interp_short.py
+++ b/gr-atsc/src/python/interp_short.py
@@ -33,6 +33,8 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr
+from gnuradio import blocks
+from gnuradio import filter
 import sys, os
 
 def graph (args):
@@ -46,19 +48,20 @@ def graph (args):
 	sys.stderr.write('usage: interp.py input_file\n')
 	sys.exit (1)
 
-    tb = gr.top_block ()
+    tb = gr.top_block()
 
-    srcf = gr.file_source (gr.sizeof_short,infile)
-    s2ss = gr.stream_to_streams(gr.sizeof_short,2)
-    s2f1 = gr.short_to_float()
-    s2f2 = gr.short_to_float()
-    src0 = gr.float_to_complex()
+    srcf = blocks.file_source(gr.sizeof_short,infile)
+    s2ss = blocks.stream_to_streams(gr.sizeof_short,2)
+    s2f1 = blocks.short_to_float()
+    s2f2 = blocks.short_to_float()
+    src0 = blocks.float_to_complex()
 
 
-    lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING )
-    lp = gr.interp_fir_filter_ccf ( 3, lp_coeffs )
+    lp_coeffs = filter.firdes.low_pass(3, 19.2e6, 3.2e6, .5e6,
+                                       filter.firdes.WIN_HAMMING)
+    lp = filter.interp_fir_filter_ccf(3, lp_coeffs)
 
-    file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
+    file = blocks.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
     tb.connect( srcf, s2ss )
     tb.connect( (s2ss, 0), s2f1, (src0,0) )
diff --git a/gr-atsc/src/python/qa_atsc.py b/gr-atsc/src/python/qa_atsc.py
index c6b8d2e957..507bc8aa47 100755
--- a/gr-atsc/src/python/qa_atsc.py
+++ b/gr-atsc/src/python/qa_atsc.py
@@ -25,7 +25,7 @@ import atsc                    # qa code needs to run without being installed
 #from gnuradio import atsc
 from atsc_utils import *
 import sys
-
+import blocks_swig as blocks
 
 class memoize(object):
     def __init__(self, thunk):
@@ -76,12 +76,12 @@ class vector_source_ts(gr.hier_block2):
         """
         Pad tranport stream packets to 256 bytes and reformat appropriately.
 
-        @param ts: MPEG transport stream.
-        @type  ts: sequence of ints in [0,255]; len(ts) % 188 == 0
+        Args:
+            ts: MPEG transport stream. (sequence of ints in [0,255]; len(ts) % 188 == 0)
         """
 
         src = gr.vector_source_b(pad_transport_stream(ts))
-        s2v = gr.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
+        s2v = blocks.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
 
 	gr.hier_block2.__init__(self, "vector_source_ts",
 				gr.io_signature(0, 0, 0),
@@ -97,7 +97,7 @@ class vector_sink_ts(gr.hier_block2):
         """
         """
 
-        v2s = gr.vector_to_stream(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
+        v2s = blocks.vector_to_stream(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
         self.sink = gr.vector_sink_b()
 	gr.hier_block2.__init__(self, "vector_sink_ts",
 				v2s.input_signature(),
diff --git a/gr-atsc/src/python/viterbi-out.py b/gr-atsc/src/python/viterbi-out.py
index 67edd99b25..cc60ffda42 100755
--- a/gr-atsc/src/python/viterbi-out.py
+++ b/gr-atsc/src/python/viterbi-out.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, atsc
+from gnuradio import blocks
 import sys, os
 
 def main(args):
@@ -36,13 +37,13 @@ def main(args):
 
 	tb = gr.top_block()
 
-        src = gr.file_source(atsc.sizeof_atsc_soft_data_segment, "/tmp/atsc_pipe_5")
+        src = blocks.file_source(atsc.sizeof_atsc_soft_data_segment, "/tmp/atsc_pipe_5")
 	viterbi = atsc.viterbi_decoder()
         deinter = atsc.deinterleaver()
         rs_dec = atsc.rs_decoder()
         derand = atsc.derandomizer()
 	depad = atsc.depad()
-        dst = gr.file_sink(gr.sizeof_char,outfile)
+        dst = blocks.file_sink(gr.sizeof_char,outfile)
 	tb.connect(src, viterbi, deinter, rs_dec, derand, depad, dst)
         tb.run ()
 
diff --git a/gr-atsc/src/python/xlate.py b/gr-atsc/src/python/xlate.py
index 68e280a8ce..3d049ac524 100755
--- a/gr-atsc/src/python/xlate.py
+++ b/gr-atsc/src/python/xlate.py
@@ -32,6 +32,8 @@
 # Input complex -3.2 to 3.2Mhz, output float 2.55 to 8.95Mhz.
 
 from gnuradio import gr
+from gnuradio import filter
+from gnuradio import blocks
 import os
 
 def graph ():
@@ -40,13 +42,13 @@ def graph ():
 
     tb = gr.top_block ()
 
-    src0 = gr.file_source (gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
+    src0 = blocks.file_source(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
-    duc_coeffs = gr.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, gr.firdes.WIN_HAMMING )
-    duc = gr.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, 5.75e6, 19.2e6 )
+    duc_coeffs = filter.firdes.low_pass( 1, 19.2e6, 9e6, 1e6, filter.firdes.WIN_HAMMING )
+    duc = filter.freq_xlating_fir_filter_ccf( 1 duc_coeffs, 5.75e6, 19.2e6 )
 
-    c2f = gr.complex_to_float()
-    file = gr.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_2")
+    c2f = blocks.complex_to_float()
+    file = blocks.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_2")
 
     tb.connect( src0, duc, c2f, file )