Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gnuradio-core / src / lib / io / gr_message_source.cc

diff --git a/gnuradio-core/src/lib/io/gr_message_source.cc b/gnuradio-core/src/lib/io/gr_message_source.cc
index 3fbe3708eeb701519e285365af5486f5e1aec637..3efc5b3216c2eebf28c61bd5507abd57b6e1219a 100644 (file)
--- a/gnuradio-core/src/lib/io/gr_message_source.cc
+++ b/gnuradio-core/src/lib/io/gr_message_source.cc
@@ -43,6 +43,13 @@ gr_make_message_source(size_t itemsize, int msgq_limit)
   return gr_message_source_sptr(new gr_message_source(itemsize, msgq_limit));
 }
 
+// public constructor that takes existing message queue
+gr_message_source_sptr
+gr_make_message_source(size_t itemsize, gr_msg_queue_sptr msgq)
+{
+  return gr_message_source_sptr(new gr_message_source(itemsize, msgq));
+}
+
 gr_message_source::gr_message_source (size_t itemsize, int msgq_limit)
   : gr_sync_block("message_source",
                  gr_make_io_signature(0, 0, 0),
@@ -51,6 +58,14 @@ gr_message_source::gr_message_source (size_t itemsize, int msgq_limit)
 {
 }
 
+gr_message_source::gr_message_source (size_t itemsize, gr_msg_queue_sptr msgq)
+  : gr_sync_block("message_source",
+                 gr_make_io_signature(0, 0, 0),
+                 gr_make_io_signature(1, 1, itemsize)),
+    d_itemsize(itemsize), d_msgq(msgq), d_msg_offset(0), d_eof(false)
+{
+}
+
 gr_message_source::~gr_message_source()
 {
 }