diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-qtgui/lib/sink_c_impl.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-qtgui/lib/sink_c_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/sink_c_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index a8a0526e77..aab5be54bf 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -137,7 +137,7 @@ namespace gr { // initialize update time to 10 times a second set_update_time(0.5); - d_last_update = gruel::high_res_timer_now(); + d_last_update = gr::high_res_timer_now(); d_update_active = false; } @@ -215,7 +215,7 @@ namespace gr { void sink_c_impl::set_update_time(double t) { - d_update_time = t * gruel::high_res_timer_tps(); + d_update_time = t * gr::high_res_timer_tps(); d_main_gui->setUpdateTime(t); } @@ -300,18 +300,18 @@ namespace gr { unsigned int datasize = noutput_items - i; unsigned int resid = d_fftsize-d_index; - if (!d_update_active && (gruel::high_res_timer_now() - d_last_update) < d_update_time) { + if (!d_update_active && (gr::high_res_timer_now() - d_last_update) < d_update_time) { consume_each(noutput_items); return noutput_items; } else { - d_last_update = gruel::high_res_timer_now(); + d_last_update = gr::high_res_timer_now(); d_update_active = true; } // If we have enough input for one full FFT, do it if(datasize >= resid) { - const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now(); + const gr::high_res_timer_type currentTime = gr::high_res_timer_now(); // Fill up residbuf with d_fftsize number of items memcpy(d_residbuf+d_index, &in[j], sizeof(gr_complex)*resid); |