diff options
| author | Ben Reynwar | 2011-06-13 13:30:19 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2011-06-13 13:30:19 -0700 |
| commit | f73984a6b43af4c4795af4b91657cc7b1ff49dae (patch) | |
| tree | f7ed1390445a1a3e8905dba741163a3876ad40f2 /gr-qtgui/lib/qtgui_time_sink_f.h | |
| parent | 2c8b1d999e7388c4513149615b5c7ebedb854d35 (diff) | |
| parent | 5ce630cbce6460b739b175257ce0d717095a55f4 (diff) | |
| download | gnuradio-f73984a6b43af4c4795af4b91657cc7b1ff49dae.tar.gz gnuradio-f73984a6b43af4c4795af4b91657cc7b1ff49dae.tar.bz2 gnuradio-f73984a6b43af4c4795af4b91657cc7b1ff49dae.zip | |
Merge branch '8psk' of https://github.com/trondeau/gnuradio into 8psk
Diffstat (limited to 'gr-qtgui/lib/qtgui_time_sink_f.h')
| -rw-r--r-- | gr-qtgui/lib/qtgui_time_sink_f.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/lib/qtgui_time_sink_f.h index 29fca79ee..a69d32877 100644 --- a/gr-qtgui/lib/qtgui_time_sink_f.h +++ b/gr-qtgui/lib/qtgui_time_sink_f.h @@ -25,7 +25,7 @@ #include <Python.h> #include <gr_qtgui_api.h> -#include <gr_block.h> +#include <gr_sync_block.h> #include <gr_firdes.h> #include <gri_fft.h> #include <qapplication.h> @@ -39,7 +39,7 @@ GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, int nconnectons=1, QWidget *parent=NULL); -class GR_QTGUI_API qtgui_time_sink_f : public gr_block +class GR_QTGUI_API qtgui_time_sink_f : public gr_sync_block { private: friend GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, @@ -51,8 +51,6 @@ private: int nconnections, QWidget *parent=NULL); - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - void initialize(); int d_size; @@ -68,8 +66,8 @@ private: QWidget *d_parent; TimeDisplayForm *d_main_gui; - timespec d_current_time; - timespec d_last_time; + gruel::high_res_timer_type d_current_time; + gruel::high_res_timer_type d_last_time; public: ~qtgui_time_sink_f(); @@ -84,10 +82,9 @@ public: QApplication *d_qApplication; - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); }; #endif /* INCLUDED_QTGUI_TIME_SINK_F_H */ |