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/freq_sink_f_impl.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-qtgui/lib/freq_sink_f_impl.h')
| -rw-r--r-- | gr-qtgui/lib/freq_sink_f_impl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index d3d8851c88..6f4d9d2062 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -26,8 +26,8 @@ #include <qtgui/freq_sink_f.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> +#include <high_res_timer.h> +#include <thread/thread.h> #include <qtgui/freqdisplayform.h> namespace gr { @@ -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(); |