summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib/freq_sink_f_impl.cc
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-04-02 16:02:33 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-02 16:02:33 -0700
commiteea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch)
treeaf3aa889c94cff9c503edefeaf19cb3635693bfb /gr-qtgui/lib/freq_sink_f_impl.cc
parente648165dcc7609524681b5eaf9620798b75b8420 (diff)
parent9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff)
Merge branch 'runtime-gruel' into next
Conflicts: gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-qtgui/lib/freq_sink_f_impl.cc')
-rw-r--r--gr-qtgui/lib/freq_sink_f_impl.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index f357ae10be..6028c8ec4e 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -208,7 +208,7 @@ namespace gr {
freq_sink_f_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;
@@ -357,7 +357,7 @@ namespace gr {
void
freq_sink_f_impl::windowreset()
{
- gruel::scoped_lock lock(d_mutex);
+ gr::thread::scoped_lock lock(d_mutex);
filter::firdes::win_type newwintype;
newwintype = d_main_gui->getFFTWindowType();
@@ -379,7 +379,7 @@ namespace gr {
void
freq_sink_f_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();
@@ -446,8 +446,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));
}