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.h | |
parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-qtgui/lib/freq_sink_c_impl.h')
-rw-r--r-- | gr-qtgui/lib/freq_sink_c_impl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 0567b914c8..ef17079567 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -26,9 +26,9 @@ #include <qtgui/freq_sink_c.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <freqdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/freqdisplayform.h> namespace gr { namespace qtgui { @@ -40,7 +40,7 @@ namespace gr { void initialize(); - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int d_fftsize; float d_fftavg; @@ -62,8 +62,8 @@ namespace gr { QWidget *d_parent; FreqDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void windowreset(); void buildwindow(); |