From a6db1d097d7be5e562c07f60a1ff711bddc5e99c Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Mon, 29 Jan 2007 00:10:51 +0000
Subject: Merged mblock work-in-progress (eb/mb r4273:4312) into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4313 221aa14e-8319-0410-a670-987f0aec2ac5
---
mblock/src/lib/mb_mblock_impl.h | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
(limited to 'mblock/src/lib/mb_mblock_impl.h')
diff --git a/mblock/src/lib/mb_mblock_impl.h b/mblock/src/lib/mb_mblock_impl.h
index c5610eddd2..1e62dd8d7e 100644
--- a/mblock/src/lib/mb_mblock_impl.h
+++ b/mblock/src/lib/mb_mblock_impl.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -23,6 +23,7 @@
#include <mb_mblock.h>
#include <mb_connection.h>
+#include <mb_msg_queue.h>
#include <list>
#include <map>
@@ -37,11 +38,14 @@ typedef std::map<std::string, mb_mblock_sptr> mb_comp_map_t;
class mb_mblock_impl : boost::noncopyable
{
mb_mblock *d_mb; // pointer to our associated mblock
+ mb_mblock *d_mb_parent; // pointer to our parent
mb_port_map_t d_port_map; // our ports
mb_comp_map_t d_comp_map; // our components
mb_conn_table d_conn_table; // our connections
+ mb_msg_queue d_msgq; // incoming messages for us
+
public:
mb_mblock_impl(mb_mblock *mb);
~mb_mblock_impl();
@@ -80,9 +84,9 @@ public:
/*!
* \brief connect endpoint_1 to endpoint_2
*
- * \param comp_name1 component on one of the connection
+ * \param comp_name1 component on one end of the connection
* \param port_name1 the name of the port on comp1
- * \param comp_name2 component on the other end the connection
+ * \param comp_name2 component on the other end of the connection
* \param port_name2 the name of the port on comp2
*
* An endpoint is specified by the component's local name (given as
@@ -98,9 +102,9 @@ public:
/*!
* \brief disconnect endpoint_1 from endpoint_2
*
- * \param comp_name1 component on one of the connection
+ * \param comp_name1 component on one end of the connection
* \param port_name1 the name of the port on comp1
- * \param comp_name2 component on the other end the connection
+ * \param comp_name2 component on the other end of the connection
* \param port_name2 the name of the port on comp2
*
* An endpoint is specified by the component's local name (given as
@@ -135,6 +139,12 @@ public:
bool
walk_tree(mb_visitor *visitor, const std::string &path="");
+ mb_msg_accepter_sptr
+ make_accepter(const std::string port_name);
+
+ mb_msg_queue &
+ msgq() { return d_msgq; }
+
/*
* Our implementation methods
*/
--
cgit v1.2.3