diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-blocks/lib/message_sink_impl.cc | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-blocks/lib/message_sink_impl.cc')
| -rw-r--r-- | gr-blocks/lib/message_sink_impl.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gr-blocks/lib/message_sink_impl.cc b/gr-blocks/lib/message_sink_impl.cc index fbc7b27d58..4dfcc6396b 100644 --- a/gr-blocks/lib/message_sink_impl.cc +++ b/gr-blocks/lib/message_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "message_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -38,34 +38,34 @@ namespace gr { namespace blocks { message_sink::sptr - message_sink::make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block) + message_sink::make(size_t itemsize, msg_queue::sptr msgq, bool dont_block) { return gnuradio::get_initial_sptr (new message_sink_impl(itemsize, msgq, dont_block)); } message_sink::sptr - message_sink::make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block, + message_sink::make(size_t itemsize, msg_queue::sptr msgq, bool dont_block, const std::string& lengthtagname) { return gnuradio::get_initial_sptr (new message_sink_impl(itemsize, msgq, dont_block, lengthtagname)); } - message_sink_impl::message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block) - : gr_sync_block("message_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + message_sink_impl::message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block) + : sync_block("message_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_msgq(msgq), d_dont_block(dont_block), d_tags(false), d_items_read(0) { } - message_sink_impl::message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block, + message_sink_impl::message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block, const std::string& lengthtagname) - : gr_sync_block("message_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("message_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_msgq(msgq), d_dont_block(dont_block), d_tags(true), d_lengthtagname(lengthtagname), d_items_read(0) { @@ -84,7 +84,7 @@ namespace gr { if (d_tags) { long packet_length = 0; - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; this->get_tags_in_range(tags, 0, d_items_read, d_items_read+1); //const size_t ninput_items = noutput_items; //assumption for sync block, this can change for (unsigned int i = 0; i < tags.size(); i++) { @@ -98,10 +98,10 @@ namespace gr { if (noutput_items >= packet_length ) { // If the message queue is full we drop the packet. if (!d_msgq->full_p()) { - gr_message_sptr msg = gr_make_message(0, // msg type - d_itemsize, // arg1 for other end - packet_length, // arg2 for other end (redundant) - packet_length * d_itemsize); // len of msg + message::sptr msg = message::make(0, // msg type + d_itemsize, // arg1 for other end + packet_length, // arg2 for other end (redundant) + packet_length * d_itemsize); // len of msg memcpy(msg->msg(), in, packet_length * d_itemsize); d_msgq->handle(msg); // send it } @@ -114,10 +114,10 @@ namespace gr { // If the queue if full we drop all the data we got. if (!d_msgq->full_p()) { // build a message to hold whatever we've got - gr_message_sptr msg = gr_make_message(0, // msg type - d_itemsize, // arg1 for other end - noutput_items, // arg2 for other end (redundant) - noutput_items * d_itemsize); // len of msg + message::sptr msg = message::make(0, // msg type + d_itemsize, // arg1 for other end + noutput_items, // arg2 for other end (redundant) + noutput_items * d_itemsize); // len of msg memcpy(msg->msg(), in, noutput_items * d_itemsize); d_msgq->handle(msg); // send it |