projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.2.2
[debian/gnuradio]
/
gnuradio-core
/
src
/
lib
/
runtime
/
gr_block.i
diff --git
a/gnuradio-core/src/lib/runtime/gr_block.i
b/gnuradio-core/src/lib/runtime/gr_block.i
index 808e24368b4559dcf9c45410704e2b36349af08b..c2e2aa4b8babff1e9d3bcf8c7490632c9e218c91 100644
(file)
--- a/
gnuradio-core/src/lib/runtime/gr_block.i
+++ b/
gnuradio-core/src/lib/runtime/gr_block.i
@@
-20,6
+20,8
@@
* Boston, MA 02110-1301, USA.
*/
* Boston, MA 02110-1301, USA.
*/
+%include <gr_basic_block.i>
+
class gr_block;
typedef boost::shared_ptr<gr_block> gr_block_sptr;
%template(gr_block_sptr) boost::shared_ptr<gr_block>;
class gr_block;
typedef boost::shared_ptr<gr_block> gr_block_sptr;
%template(gr_block_sptr) boost::shared_ptr<gr_block>;
@@
-29,26
+31,21
@@
namespace std {
%template(x_vector_gr_block_sptr) vector<gr_block_sptr>;
};
%template(x_vector_gr_block_sptr) vector<gr_block_sptr>;
};
-class gr_block {
+class gr_block
: public gr_basic_block
{
protected:
gr_block (const std::string &name,
protected:
gr_block (const std::string &name,
- gr_io_signature_sptr input_signature,
- gr_io_signature_sptr output_signature);
+ gr_io_signature_sptr input_signature,
+ gr_io_signature_sptr output_signature);
public:
virtual ~gr_block ();
public:
virtual ~gr_block ();
- std::string name () const;
- gr_io_signature_sptr input_signature () const;
- gr_io_signature_sptr output_signature () const;
- long unique_id () const;
unsigned history () const;
int output_multiple () const;
double relative_rate () const;
unsigned history () const;
int output_multiple () const;
double relative_rate () const;
- bool check_topology (int ninputs, int noutputs);
bool start();
bool stop();
bool start();
bool stop();
@@
-57,9
+54,6
@@
class gr_block {
void set_detail (gr_block_detail_sptr detail) { d_detail = detail; }
};
void set_detail (gr_block_detail_sptr detail) { d_detail = detail; }
};
-%rename(block_ncurrently_allocated) gr_block_ncurrently_allocated;
-long gr_block_ncurrently_allocated ();
-
%pythoncode %{
gr_block_sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id ())
gr_block_sptr.block = lambda self: self
%pythoncode %{
gr_block_sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id ())
gr_block_sptr.block = lambda self: self