diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-wxgui/lib/oscope_guts.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-wxgui/lib/oscope_guts.cc')
| -rw-r--r-- | gr-wxgui/lib/oscope_guts.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-wxgui/lib/oscope_guts.cc b/gr-wxgui/lib/oscope_guts.cc index 3d1f085a6f..d406932dae 100644 --- a/gr-wxgui/lib/oscope_guts.cc +++ b/gr-wxgui/lib/oscope_guts.cc @@ -24,7 +24,7 @@ #include <config.h> #endif -#include <wxgui/oscope_guts.h> +#include <gnuradio/wxgui/oscope_guts.h> #include <stdexcept> #include <stdio.h> #include <algorithm> @@ -68,7 +68,7 @@ namespace gr { return wrap_bi(buffer_index - 1, mx); } - oscope_guts::oscope_guts(double sample_rate, gr_msg_queue_sptr msgq) + oscope_guts::oscope_guts(double sample_rate, msg_queue::sptr msgq) : d_nchannels(1), d_msgq(msgq), d_trigger_mode(TRIG_MODE_AUTO), @@ -251,8 +251,8 @@ namespace gr { if(d_msgq->full_p()) return; // Build a message to hold the output records - gr_message_sptr msg = - gr_make_message(0, // msg type + message::sptr msg = + message::make(0, // msg type d_nchannels, // arg1 for other side mx, // arg2 for other side ((d_nchannels * mx) + 1) * sizeof(float)); // sizeof payload |