Merge r6461:6464 from jcorgan/t162-staging into trunk.

[debian/gnuradio] / gnuradio-core / src / lib / runtime / gr_hier_block2.h

diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
index 7ecc0d770bad3df136d0904a3045530563cb00c1..6124e4d51a6b2de132d7499ae5b1dfd0dbdd2828 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
@@ -58,32 +58,18 @@ protected:
 public:
   virtual ~gr_hier_block2();
   
+  void connect(gr_basic_block_sptr block);
+
   void connect(gr_basic_block_sptr src, int src_port, 
               gr_basic_block_sptr dst, int dst_port);
 
+  void disconnect(gr_basic_block_sptr block);
+
   void disconnect(gr_basic_block_sptr src, int src_port,
                  gr_basic_block_sptr dst, int dst_port);
 
-  /*!
-   * Lock a flowgraph in preparation for reconfiguration.  When an equal
-   * number of calls to lock() and unlock() have occurred, the flowgraph
-   * will be restarted automatically.
-   *
-   * N.B. lock() and unlock() cannot be called from a flowgraph thread
-   * (E.g., gr_block::work method) or deadlock will occur when
-   * reconfiguration happens.
-   */
+  void disconnect_all();
   virtual void lock();
-
-  /*!
-   * Lock a flowgraph in preparation for reconfiguration.  When an equal
-   * number of calls to lock() and unlock() have occurred, the flowgraph
-   * will be restarted automatically.
-   *
-   * N.B. lock() and unlock() cannot be called from a flowgraph thread
-   * (E.g., gr_block::work method) or deadlock will occur when
-   * reconfiguration happens.
-   */
   virtual void unlock();
 
   gr_flat_flowgraph_sptr flatten() const;