diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-10 23:52:51 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-10 23:52:51 -0400 |
| commit | 294a6fd3b811703329eb15ed91d848c65cc6700e (patch) | |
| tree | b422709c45c6bd8a67255d1c55f0cc34604e5bfc /gr-atsc | |
| parent | 5a3f0062fa438875b68191363d4ff78ccd07d0c9 (diff) | |
blocks: removing file_sink/source file_descriptor_sink/source form core and moved all refs to gr-blocks.
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/python/all_atsc.py | 6 | ||||
| -rwxr-xr-x | gr-atsc/src/python/btl-fsd.py | 5 | ||||
| -rwxr-xr-x | gr-atsc/src/python/fpll.py | 6 | ||||
| -rwxr-xr-x | gr-atsc/src/python/interp.py | 5 | ||||
| -rwxr-xr-x | gr-atsc/src/python/interp_short.py | 4 | ||||
| -rwxr-xr-x | gr-atsc/src/python/viterbi-out.py | 5 | ||||
| -rwxr-xr-x | gr-atsc/src/python/xlate.py | 4 |
7 files changed, 19 insertions, 16 deletions
diff --git a/gr-atsc/src/python/all_atsc.py b/gr-atsc/src/python/all_atsc.py index 6fcb02fda7..7cac785149 100644 --- a/gr-atsc/src/python/all_atsc.py +++ b/gr-atsc/src/python/all_atsc.py @@ -49,7 +49,7 @@ 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) + 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() @@ -128,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/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 69749420b4..dee81da13d 100755 --- a/gr-atsc/src/python/fpll.py +++ b/gr-atsc/src/python/fpll.py @@ -31,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 @@ -69,8 +69,8 @@ def main(): 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 39e1caea0d..ee2d234892 100755 --- a/gr-atsc/src/python/interp.py +++ b/gr-atsc/src/python/interp.py @@ -32,6 +32,7 @@ # then at 0 with edges at -3.2MHz and 3.2MHz. from gnuradio import gr +from gnuradio import blocks import sys def graph(args): @@ -45,13 +46,13 @@ def graph(args): tb = gr.top_block() - src0 = gr.file_source(gr.sizeof_gr_complex, infile) + src0 = blocks.file_source(gr.sizeof_gr_complex, infile) 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) diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py index 749d15d0a7..d07b941c12 100755 --- a/gr-atsc/src/python/interp_short.py +++ b/gr-atsc/src/python/interp_short.py @@ -50,7 +50,7 @@ def graph (args): tb = gr.top_block() - srcf = gr.file_source(gr.sizeof_short,infile) + 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() @@ -61,7 +61,7 @@ def graph (args): 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/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 ca7aa667e7..3d049ac524 100755 --- a/gr-atsc/src/python/xlate.py +++ b/gr-atsc/src/python/xlate.py @@ -42,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 = 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 = blocks.complex_to_float() - file = gr.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_2") + file = blocks.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_2") tb.connect( src0, duc, c2f, file ) |