summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib/const_sink_c_impl.cc
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-04-02 23:04:08 -0700
committerBen Reynwar <ben@reynwar.net>2013-04-02 23:04:08 -0700
commitc6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch)
tree71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-qtgui/lib/const_sink_c_impl.cc
parent22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff)
parent98758cbfa9a2aff714952d19e773bc370dfa2185 (diff)
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-qtgui/lib/const_sink_c_impl.cc')
-rw-r--r--gr-qtgui/lib/const_sink_c_impl.cc8
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,