[Commit-gnuradio] r3869 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-10-26 18:30:19 -0600 (Thu, 26 Oct 2006)
New Revision: 3869

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
Log:
Work in progress. Moved io_signatures into gr_basic_block.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-27 00:10:28 UTC (rev 3868)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-27 00:30:19 UTC (rev 3869)
@@ -27,8 +27,12 @@
 #include <gr_basic_block.h>
 #include <stdexcept>
 
-gr_basic_block::gr_basic_block(std::string name) :
-    d_name(name)
+gr_basic_block::gr_basic_block(const std::string name,
+                               gr_io_signature_sptr input_signature,
+                               gr_io_signature_sptr output_signature) 
+  : d_name(name),
+    d_input_signature(input_signature),
+    d_output_signature(output_signature)
 {
 }
   

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-27 00:10:28 UTC (rev 3868)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-27 00:30:19 UTC (rev 3869)
@@ -29,14 +29,20 @@
 class gr_basic_block
 {
 private:
-    std::string                d_name;
+    std::string                 d_name;
+    gr_io_signature_sptr d_input_signature;
+    gr_io_signature_sptr d_output_signature;
         
 protected:
-    gr_basic_block(const std::string name);
+    gr_basic_block(const std::string name,
+                   gr_io_signature_sptr input_signature,
+                   gr_io_signature_sptr output_signature);
 
 public:
     virtual ~gr_basic_block();
-    std::string name () const { return d_name; }
+    std::string name() const { return d_name; }
+    gr_io_signature_sptr input_signature() const  { return d_input_signature; }
+    gr_io_signature_sptr output_signature() const { return d_output_signature; 
}
 };
 
 #endif /* INCLUDED_GR_BASIC_BLOCK_H */

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-27 00:10:28 UTC (rev 3868)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-27 00:30:19 UTC (rev 3869)
@@ -37,6 +37,8 @@
 public:
     virtual ~gr_basic_block();
     std::string name() const;
+    gr_io_signature_sptr input_signature () const;
+    gr_io_signature_sptr output_signature () const;
 };
 
 %pythoncode %{

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-10-27 00:10:28 UTC (rev 3868)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-10-27 00:30:19 UTC (rev 3869)
@@ -40,9 +40,7 @@
 gr_block::gr_block (const std::string &name,
                    gr_io_signature_sptr input_signature,
                    gr_io_signature_sptr output_signature)
-  : gr_basic_block(name),
-    d_input_signature (input_signature),
-    d_output_signature (output_signature),
+  : gr_basic_block(name, input_signature, output_signature),
     d_output_multiple (1),
     d_relative_rate (1.0),
     d_unique_id (s_next_id++),

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
  2006-10-27 00:10:28 UTC (rev 3868)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
  2006-10-27 00:30:19 UTC (rev 3869)
@@ -24,7 +24,6 @@
 #define INCLUDED_GR_BLOCK_H
 
 #include <gr_basic_block.h>
-#include <gr_runtime.h>
 
 /*!
  * \brief The abstract base class for all signal processing blocks.
@@ -54,9 +53,6 @@
  public:
   
   virtual ~gr_block ();
-  
-  gr_io_signature_sptr input_signature () const  { return d_input_signature; }
-  gr_io_signature_sptr output_signature () const { return d_output_signature; }
   long unique_id () const { return d_unique_id; }
 
   /*!

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
  2006-10-27 00:10:28 UTC (rev 3868)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
  2006-10-27 00:30:19 UTC (rev 3869)
@@ -39,8 +39,6 @@
   
   virtual ~gr_block ();
   
-  gr_io_signature_sptr input_signature () const;
-  gr_io_signature_sptr output_signature () const;
   long unique_id () const;
   unsigned history () const;