diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-01-12 12:21:17 -0800 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-01-12 12:21:17 -0800 |
commit | e70db91c1621ff3673323a6514fd646575b11e43 (patch) | |
tree | 59b5379e884e1f2ac103aec9adcc39ab70366861 /gr-qtgui/lib/const_sink_c_impl.cc | |
parent | 8d80d0adacc98b02392428ab5284d8417df9c776 (diff) | |
parent | 6225e5d4d1edd67c896c6c43bdc584a078480a8d (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-qtgui/lib/const_sink_c_impl.cc')
-rw-r--r-- | gr-qtgui/lib/const_sink_c_impl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 26ddf793dc..3f3bbf4405 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -98,7 +98,6 @@ namespace gr { set_trigger_mode(TRIG_MODE_FREE, TRIG_SLOPE_POS, 0, 0); set_history(2); // so we can look ahead for the trigger slope - declare_sample_delay(1); // delay the tags for a history of 2 } const_sink_c_impl::~const_sink_c_impl() @@ -439,7 +438,7 @@ namespace gr { if(tags.size() > 0) { d_triggered = true; trigger_index = tags[0].offset - nr; - d_start = d_index + trigger_index - 1; + d_start = d_index + trigger_index; d_end = d_start + d_size; d_trigger_count = 0; } @@ -516,7 +515,7 @@ namespace gr { in = (const gr_complex*)input_items[n]; volk_32fc_deinterleave_64f_x2(&d_residbufs_real[n][d_index], &d_residbufs_imag[n][d_index], - &in[0], nitems); + &in[history()-1], nitems); } d_index += nitems; |