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/const_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/const_sink_c_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/const_sink_c_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index b623dc2175..9064be4ebe 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -145,7 +145,7 @@ namespace gr { const_sink_c_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -244,7 +244,7 @@ namespace gr { void const_sink_c_impl::set_nsamps(const int newsize) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); if(newsize != d_size) { // Resize residbuf and replace data @@ -325,8 +325,8 @@ namespace gr { } // Update the plot if its time - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new ConstUpdateEvent(d_residbufs_real, d_residbufs_imag, |