diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-17 12:24:38 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-17 15:40:32 -0400 |
| commit | d4f6b86a9bdea09c2c158b9982559a727f8c6a0b (patch) | |
| tree | 60b452d387bd494b461ee78b2b0faec1fbf6e5fe /grc/grc_gnuradio/blks2/selector.py | |
| parent | ee2b700f72503d6e7f62adbfb7dff9997b9cb003 (diff) | |
blocks: converting references to vector source/sink, null source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to use gr-blocks.
Diffstat (limited to 'grc/grc_gnuradio/blks2/selector.py')
| -rw-r--r-- | grc/grc_gnuradio/blks2/selector.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/grc/grc_gnuradio/blks2/selector.py b/grc/grc_gnuradio/blks2/selector.py index f6a8aa79b1..bc393f84b6 100644 --- a/grc/grc_gnuradio/blks2/selector.py +++ b/grc/grc_gnuradio/blks2/selector.py @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,7 @@ # from gnuradio import gr +from gnuradio import blocks class selector(gr.hier_block2): """A hier2 block with N inputs and M outputs, where data is only forwarded through input n to output m.""" @@ -40,12 +41,13 @@ class selector(gr.hier_block2): gr.io_signature(num_outputs, num_outputs, item_size), ) #terminator blocks for unused inputs and outputs - self.input_terminators = [gr.null_sink(item_size) for i in range(num_inputs)] - self.output_terminators = [gr.head(item_size, 0) for i in range(num_outputs)] - self.copy = gr.kludge_copy(item_size) + self.input_terminators = [blocks.null_sink(item_size) for i in range(num_inputs)] + self.output_terminators = [blocks.head(item_size, 0) for i in range(num_outputs)] + self.copy = blocks.copy(item_size) #connections for i in range(num_inputs): self.connect((self, i), self.input_terminators[i]) - for i in range(num_outputs): self.connect(gr.null_source(item_size), self.output_terminators[i], (self, i)) + for i in range(num_outputs): self.connect(blocks.null_source(item_size), + self.output_terminators[i], (self, i)) self.item_size = item_size self.input_index = input_index self.output_index = output_index |