diff options
Diffstat (limited to 'gnuradio-runtime/include/gnuradio')
6 files changed, 26 insertions, 13 deletions
diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h index de1cbe41f..1d31e2e9b 100644 --- a/gnuradio-runtime/include/gnuradio/basic_block.h +++ b/gnuradio-runtime/include/gnuradio/basic_block.h @@ -38,9 +38,7 @@ #include <map> #include <string> -#ifdef GR_CTRLPORT #include <gnuradio/rpcregisterhelpers.h> -#endif namespace gr { diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h index 57041eb56..7756841a3 100644 --- a/gnuradio-runtime/include/gnuradio/block_gateway.h +++ b/gnuradio-runtime/include/gnuradio/block_gateway.h @@ -150,6 +150,18 @@ public: return gr::block::set_min_output_buffer(size); } + long block__max_output_buffer(size_t i) { + return gr::block::max_output_buffer(i); + } + + void block__set_max_output_buffer(long max_output_buffer) { + gr::block::set_max_output_buffer(max_output_buffer); + } + + void block__set_max_output_buffer(int port, long max_output_buffer) { + gr::block::set_max_output_buffer(port, max_output_buffer); + } + int block__output_multiple(void) const { return gr::block::output_multiple(); } void block__consume(int which_input, int how_many_items) diff --git a/gnuradio-runtime/include/gnuradio/block_registry.h b/gnuradio-runtime/include/gnuradio/block_registry.h index 2f12a01bb..5050df8ce 100644 --- a/gnuradio-runtime/include/gnuradio/block_registry.h +++ b/gnuradio-runtime/include/gnuradio/block_registry.h @@ -25,6 +25,7 @@ #include <gnuradio/api.h> #include <gnuradio/basic_block.h> +#include <gnuradio/thread/thread.h> #include <map> namespace gr { diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h b/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h index 605196387..345933179 100644 --- a/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h +++ b/gnuradio-runtime/include/gnuradio/messages/msg_accepter_msgq.h @@ -33,7 +33,7 @@ namespace messages { * \brief Concrete class that accepts messages and inserts them * into a message queue. */ -class GR_RUNTIME_API msg_accepter_msgq : public msg_accepter +class GR_RUNTIME_API msg_accepter_msgq { protected: msg_queue_sptr d_msg_queue; diff --git a/gnuradio-runtime/include/gnuradio/random.h b/gnuradio-runtime/include/gnuradio/random.h index 95931baf7..82c902678 100644 --- a/gnuradio-runtime/include/gnuradio/random.h +++ b/gnuradio-runtime/include/gnuradio/random.h @@ -96,7 +96,9 @@ public: float rayleigh(); /*! - * \brief FIXME: add description + * \brief Exponentially distributed random numbers with values less than or equal + * to factor replaced with zero. The underlying exponential distribution has + * mean sqrt(2) and variance 2. */ float impulse(float factor); diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h index 85be9662e..70f8e1773 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h @@ -60,8 +60,8 @@ private: } void operator()(T& x) { x->i()->registerConfigureCallback(id, callback); } - const std::string& id; - const Tcallback& callback; + const std::string id; + const Tcallback callback; }; template <class T, typename Tcallback> @@ -69,7 +69,7 @@ private: unregisterConfigureCallback_f(const std::string& _id) : id(_id) { ; } void operator()(T& x) { x->i()->unregisterConfigureCallback(id); } - const std::string& id; + const std::string id; }; template <class T, typename Tcallback> @@ -81,8 +81,8 @@ private: } void operator()(T& x) { x->i()->registerQueryCallback(id, callback); } - const std::string& id; - const Tcallback& callback; + const std::string id; + const Tcallback callback; }; template <class T, typename Tcallback> @@ -90,7 +90,7 @@ private: unregisterQueryCallback_f(const std::string& _id) : id(_id) { ; } void operator()(T& x) { x->i()->unregisterQueryCallback(id); } - const std::string& id; + const std::string id; }; @@ -103,8 +103,8 @@ private: } void operator()(T& x) { x->i()->registerHandlerCallback(id, callback); } - const std::string& id; - const Tcallback& callback; + const std::string id; + const Tcallback callback; }; template <class T, typename Tcallback> @@ -112,7 +112,7 @@ private: unregisterHandlerCallback_f(const std::string& _id) : id(_id) { ; } void operator()(T& x) { x->i()->unregisterHandlerCallback(id); } - const std::string& id; + const std::string id; }; |