diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-qtgui/lib/freq_sink_c_impl.cc | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-qtgui/lib/freq_sink_c_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/freq_sink_c_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index b1f9a2b1a1..4508750457 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -208,7 +208,7 @@ namespace gr { freq_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; @@ -376,7 +376,7 @@ namespace gr { void freq_sink_c_impl::fftresize() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); int newfftsize = d_main_gui->getFFTSize(); d_fftavg = d_main_gui->getFFTAverage(); @@ -443,8 +443,8 @@ namespace gr { //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - 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 FreqUpdateEvent(d_magbufs, d_fftsize)); } |