diff options
| author | Tom Rondeau | 2010-11-28 19:17:07 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-28 19:17:07 -0500 |
| commit | 0f2bd2c94baa43fc8626f5285c0696a379ef5efd (patch) | |
| tree | 66ec754f80c5c3c869201dc42e50dda1a1f55ffc /gnuradio-core/src/lib/runtime | |
| parent | 26a6c76d7bfcf744a41760fb3ed1be71b1a2f338 (diff) | |
| download | gnuradio-0f2bd2c94baa43fc8626f5285c0696a379ef5efd.tar.gz gnuradio-0f2bd2c94baa43fc8626f5285c0696a379ef5efd.tar.bz2 gnuradio-0f2bd2c94baa43fc8626f5285c0696a379ef5efd.zip | |
Swapping order of testing rrate.
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block_executor.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.cc b/gnuradio-core/src/lib/runtime/gr_block_executor.cc index 9c30b1334..112150235 100644 --- a/gnuradio-core/src/lib/runtime/gr_block_executor.cc +++ b/gnuradio-core/src/lib/runtime/gr_block_executor.cc @@ -110,7 +110,13 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d, d->nitems_read(i)); std::vector<pmt::pmt_t>::iterator t; - if(rrate != 1.0) { + if(rrate == 1.0) { + for(t = rtags.begin(); t != rtags.end(); t++) { + for(int o = 0; o < d->noutputs(); o++) + d->output(o)->add_item_tag(*t); + } + } + else { for(t = rtags.begin(); t != rtags.end(); t++) { uint64_t newcount = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*t, 0)); pmt::pmt_t newtup = pmt::mp(pmt::pmt_from_uint64(newcount * rrate), @@ -122,12 +128,6 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d, d->output(o)->add_item_tag(newtup); } } - else { - for(t = rtags.begin(); t != rtags.end(); t++) { - for(int o = 0; o < d->noutputs(); o++) - d->output(o)->add_item_tag(*t); - } - } } break; case gr_block::TPP_ONE_TO_ONE: |