diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-blocks | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-blocks')
430 files changed, 2561 insertions, 2774 deletions
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt index b6eaa31e9..13b41a2e3 100644 --- a/gr-blocks/CMakeLists.txt +++ b/gr-blocks/CMakeLists.txt @@ -80,7 +80,7 @@ CPACK_COMPONENT("blocks_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/blocks) +add_subdirectory(include/gnuradio/blocks) add_subdirectory(lib) #if(ENABLE_TESTING) # add_subdirectory(tests) diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index a24e5b423..150b3f1c9 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -177,6 +177,7 @@ <cat> <name>Stream Tag Tools</name> <block>blocks_tag_debug</block> + <block>blocks_tag_gate</block> <block>blocks_tagged_file_sink</block> <block>blocks_tagged_stream_mux</block> </cat> diff --git a/gr-blocks/grc/blocks_message_strobe.xml b/gr-blocks/grc/blocks_message_strobe.xml index 8cd39a8bf..893759432 100644 --- a/gr-blocks/grc/blocks_message_strobe.xml +++ b/gr-blocks/grc/blocks_message_strobe.xml @@ -10,10 +10,11 @@ <import>from gnuradio import blocks</import> <import>import pmt</import> <make>blocks.message_strobe($msg, $period)</make> + <callback>set_msg($msg)</callback> <param> <name>Message PMT</name> <key>msg</key> - <value>pmt.pmt_intern("TEST")</value> + <value>pmt.intern("TEST")</value> <type>raw</type> </param> <param> diff --git a/gr-blocks/grc/blocks_tag_gate.xml b/gr-blocks/grc/blocks_tag_gate.xml new file mode 100644 index 000000000..5c748f27c --- /dev/null +++ b/gr-blocks/grc/blocks_tag_gate.xml @@ -0,0 +1,68 @@ +<?xml version="1.0"?> +<block> + <name>Tag Gate</name> + <key>blocks_tag_gate</key> + <import>from gnuradio import blocks</import> + <make>blocks.tag_gate($type.size * $vlen, $propagate_tags)</make> + <param> + <name>Item Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex</key> + <opt>size:gr.sizeof_gr_complex</opt> + </option> + <option> + <name>Float</name> + <key>float</key> + <opt>size:gr.sizeof_float</opt> + </option> + <option> + <name>Int</name> + <key>int</key> + <opt>size:gr.sizeof_int</opt> + </option> + <option> + <name>Short</name> + <key>short</key> + <opt>size:gr.sizeof_short</opt> + </option> + <option> + <name>Byte</name> + <key>byte</key> + <opt>size:gr.sizeof_char</opt> + </option> + </param> + <param> + <name>Vec Length</name> + <key>vlen</key> + <value>1</value> + <type>int</type> + </param> + <param> + <name>Propagate_tags</name> + <key>propagate_tags</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + <check>$vlen > 0</check> + <sink> + <name>in</name> + <type>$type</type> + <vlen>$vlen</vlen> + </sink> + <source> + <name>out</name> + <type>$type</type> + <vlen>$vlen</vlen> + </source> +</block> diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt index 14346f9c1..13e1ac71b 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt @@ -187,6 +187,7 @@ install(FILES streams_to_vector.h stretch_ff.h tag_debug.h + tag_gate.h tagged_file_sink.h tagged_stream_mux.h tagged_stream_to_pdu.h diff --git a/gr-blocks/include/blocks/add_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_XX.h.t index ffe08f683..08e9646af 100644 --- a/gr-blocks/include/blocks/add_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/add_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,7 +38,7 @@ namespace gr { * \details * Add across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/add_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t index 3a99978b6..3e783213a 100644 --- a/gr-blocks/include/blocks/add_const_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief output = input + constant * \ingroup math_operators_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/add_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t index 33a50a42c..ea6c35695 100644 --- a/gr-blocks/include/blocks/add_const_vXX.h.t +++ b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief output = input + constant vector * \ingroup math_operators_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/add_ff.h b/gr-blocks/include/gnuradio/blocks/add_ff.h index 6a9bbfbde..fd2420ce0 100644 --- a/gr-blocks/include/blocks/add_ff.h +++ b/gr-blocks/include/gnuradio/blocks/add_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_ADD_FF_H #define INCLUDED_BLOCKS_ADD_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -36,11 +36,11 @@ namespace gr { * \details * Add across all input streams. */ - class BLOCKS_API add_ff : virtual public gr_sync_block + class BLOCKS_API add_ff : virtual public sync_block { public: - // gr::blocks::add_ff::sptr + // gr::gnuradio/blocks::add_ff::sptr typedef boost::shared_ptr<add_ff> sptr; /*! diff --git a/gr-blocks/include/blocks/and_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_XX.h.t index 048e1bea5..820daefdb 100644 --- a/gr-blocks/include/blocks/and_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/and_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,7 +37,7 @@ namespace gr { * * bitwise boolean and across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/and_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t index 9e478819c..a4c83a4ea 100644 --- a/gr-blocks/include/blocks/and_const_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,7 +37,7 @@ namespace gr { * * bitwise boolean and of const to the data stream. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/annotator_1to1.h b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h index 61bc1697c..a452da2e7 100644 --- a/gr-blocks/include/blocks/annotator_1to1.h +++ b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_ANNOTATOR_1TO1_H #define INCLUDED_GR_ANNOTATOR_1TO1_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -46,15 +46,15 @@ namespace gr { * Warning: This block is only meant for testing and showing how to use the * tags. */ - class BLOCKS_API annotator_1to1 : virtual public gr_sync_block + class BLOCKS_API annotator_1to1 : virtual public sync_block { public: - // gr::blocks::annotator_1to1::sptr + // gr::gnuradio/blocks::annotator_1to1::sptr typedef boost::shared_ptr<annotator_1to1> sptr; static sptr make(int when, size_t sizeof_stream_item); - virtual std::vector<gr_tag_t> data() const = 0; + virtual std::vector<tag_t> data() const = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/annotator_alltoall.h b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h index fa33d440b..004aa54dd 100644 --- a/gr-blocks/include/blocks/annotator_alltoall.h +++ b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_H #define INCLUDED_GR_ANNOTATOR_ALLTOALL_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -46,15 +46,15 @@ namespace gr { * * This block is only meant for testing and showing how to use the tags. */ - class BLOCKS_API annotator_alltoall : virtual public gr_sync_block + class BLOCKS_API annotator_alltoall : virtual public sync_block { public: - // gr::blocks::annotator_alltoall::sptr + // gr::gnuradio/blocks::annotator_alltoall::sptr typedef boost::shared_ptr<annotator_alltoall> sptr; static sptr make(int when, size_t sizeof_stream_item); - virtual std::vector<gr_tag_t> data() const = 0; + virtual std::vector<tag_t> data() const = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/annotator_raw.h b/gr-blocks/include/gnuradio/blocks/annotator_raw.h index 56c25c808..70c425443 100644 --- a/gr-blocks/include/blocks/annotator_raw.h +++ b/gr-blocks/include/gnuradio/blocks/annotator_raw.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_ANNOTATOR_RAW_H #define INCLUDED_GR_ANNOTATOR_RAW_H -#include <blocks/api.h> -#include <gr_sync_block.h> -#include <gr_tags.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/tags.h> namespace gr { namespace blocks { @@ -35,16 +35,16 @@ namespace gr { * \ingroup debug_tools_blk * * \details - * This block creates arbitrary tags to be sent downstream blocks + * This block creates arbitrary tags to be sent downstream gnuradio/blocks * to be sent are set manually via accessor methods and are sent * only once. * - * This block is intended for testing of tag related blocks + * This block is intended for testing of tag related gnuradio/blocks */ - class BLOCKS_API annotator_raw : virtual public gr_sync_block + class BLOCKS_API annotator_raw : virtual public sync_block { public: - // gr::blocks::annotator_raw::sptr + // gr::gnuradio/blocks::annotator_raw::sptr typedef boost::shared_ptr<annotator_raw> sptr; static sptr make(size_t sizeof_stream_item); diff --git a/gr-blocks/include/blocks/api.h b/gr-blocks/include/gnuradio/blocks/api.h index d77bdbdd5..fd4e605b5 100644 --- a/gr-blocks/include/blocks/api.h +++ b/gr-blocks/include/gnuradio/blocks/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_BLOCKS_API_H #define INCLUDED_BLOCKS_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_blocks_EXPORTS # define BLOCKS_API __GR_ATTR_EXPORT diff --git a/gr-blocks/include/blocks/argmax_XX.h.t b/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t index 93aa36726..71468726e 100644 --- a/gr-blocks/include/blocks/argmax_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -46,7 +46,7 @@ namespace gr { * Stream 1 will contain the number of the input stream that * held the maximum value. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/bin_statistics_f.h b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h index a73103866..1d8661e0a 100644 --- a/gr-blocks/include/blocks/bin_statistics_f.h +++ b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_GR_BIN_STATISTICS_F_H #define INCLUDED_GR_BIN_STATISTICS_F_H -#include <blocks/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> -#include <gr_feval.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> +#include <gnuradio/feval.h> namespace gr { namespace blocks { @@ -35,21 +35,21 @@ namespace gr { * \brief control scanning and record frequency domain statistics * \ingroup misc_blk */ - class BLOCKS_API bin_statistics_f : virtual public gr_sync_block + class BLOCKS_API bin_statistics_f : virtual public sync_block { protected: std::vector<float> d_max; // per bin maxima virtual size_t vlen() const = 0; virtual double center_freq() const = 0; - virtual gr_msg_queue_sptr msgq() const = 0; + virtual gr::msg_queue::sptr msgq() const = 0; virtual void reset_stats() = 0; virtual void accrue_stats(const float *input) = 0; virtual void send_stats() = 0; public: - // gr::blocks::bin_statistics_f::sptr + // gr::gnuradio/blocks::bin_statistics_f::sptr typedef boost::shared_ptr<bin_statistics_f> sptr; /*! @@ -59,13 +59,13 @@ namespace gr { * * \param vlen vector length * \param msgq message queue - * \param tune a gr_feval_dd callback function + * \param tune a feval_dd callback function * \param tune_delay number of samples for the tune delay * \param dwell_delay number of samples for the dwell delay */ static sptr make(unsigned int vlen, // vector length - gr_msg_queue_sptr msgq, - gr_feval_dd *tune, // callback + gr::msg_queue::sptr msgq, + feval_dd *tune, // callback size_t tune_delay, // samples size_t dwell_delay); // samples }; diff --git a/gr-blocks/include/blocks/burst_tagger.h b/gr-blocks/include/gnuradio/blocks/burst_tagger.h index 312fb2ffb..e10938980 100644 --- a/gr-blocks/include/blocks/burst_tagger.h +++ b/gr-blocks/include/gnuradio/blocks/burst_tagger.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_BURST_TAGGER_H #define INCLUDED_GR_BURST_TAGGER_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -44,14 +44,14 @@ namespace gr { * * The signal on stream 0 is retransmitted to output stream 0. */ - class BLOCKS_API burst_tagger : virtual public gr_sync_block + class BLOCKS_API burst_tagger : virtual public sync_block { public: - // gr::blocks::burst_tagger::sptr + // gr::gnuradio/blocks::burst_tagger::sptr typedef boost::shared_ptr<burst_tagger> sptr; /*! - * Build a burst tagger blocks. + * Build a burst tagger gnuradio/blocks. * * \param itemsize itemsize of the signal stream on input 0. */ diff --git a/gr-blocks/include/blocks/char_to_float.h b/gr-blocks/include/gnuradio/blocks/char_to_float.h index 0002ceb30..71861adf1 100644 --- a/gr-blocks/include/blocks/char_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/char_to_float.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_CHAR_TO_FLOAT_H #define INCLUDED_BLOCKS_CHAR_TO_FLOAT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief Convert stream of chars to a stream of float * \ingroup type_converters_blk */ - class BLOCKS_API char_to_float : virtual public gr_sync_block + class BLOCKS_API char_to_float : virtual public sync_block { public: - // gr::blocks::char_to_float_ff::sptr + // gr::gnuradio/blocks::char_to_float_ff::sptr typedef boost::shared_ptr<char_to_float> sptr; /*! diff --git a/gr-blocks/include/blocks/char_to_short.h b/gr-blocks/include/gnuradio/blocks/char_to_short.h index fc9d3b4b5..62800b216 100644 --- a/gr-blocks/include/blocks/char_to_short.h +++ b/gr-blocks/include/gnuradio/blocks/char_to_short.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_CHAR_TO_SHORT_H #define INCLUDED_BLOCKS_CHAR_TO_SHORT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief Convert stream of chars to a stream of short * \ingroup type_converters_blk */ - class BLOCKS_API char_to_short : virtual public gr_sync_block + class BLOCKS_API char_to_short : virtual public sync_block { public: - // gr::blocks::char_to_short_ff::sptr + // gr::gnuradio/blocks::char_to_short_ff::sptr typedef boost::shared_ptr<char_to_short> sptr; static sptr make(size_t vlen=1); diff --git a/gr-blocks/include/blocks/check_lfsr_32k_s.h b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h index 89f56d8c9..86714d93f 100644 --- a/gr-blocks/include/blocks/check_lfsr_32k_s.h +++ b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_CHECK_LFSR_32K_S_H #define INCLUDED_GR_CHECK_LFSR_32K_S_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,10 +38,10 @@ namespace gr { * gr::blocks::lfsr_32k_source_s to test the USRP using its * digital loopback mode. */ - class BLOCKS_API check_lfsr_32k_s : virtual public gr_sync_block + class BLOCKS_API check_lfsr_32k_s : virtual public sync_block { public: - // gr::blocks::check_lfsr_32k_s::sptr + // gr::gnuradio/blocks::check_lfsr_32k_s::sptr typedef boost::shared_ptr<check_lfsr_32k_s> sptr; static sptr make(); diff --git a/gr-blocks/include/blocks/complex_to_arg.h b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h index 178f84670..63e2a37cb 100644 --- a/gr-blocks/include/blocks/complex_to_arg.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_ARG_H #define INCLUDED_BLOCKS_COMPLEX_TO_ARG_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief complex in, arg out (float) * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_arg : virtual public gr_sync_block + class BLOCKS_API complex_to_arg : virtual public sync_block { public: - // gr::blocks::complex_to_arg_ff::sptr + // gr::gnuradio/blocks::complex_to_arg_ff::sptr typedef boost::shared_ptr<complex_to_arg> sptr; /*! diff --git a/gr-blocks/include/blocks/complex_to_float.h b/gr-blocks/include/gnuradio/blocks/complex_to_float.h index 7648648d6..341d2e2d9 100644 --- a/gr-blocks/include/blocks/complex_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_float.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H #define INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief convert a stream of gr_complex to 1 or 2 streams of float * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_float : virtual public gr_sync_block + class BLOCKS_API complex_to_float : virtual public sync_block { public: - // gr::blocks::complex_to_float_ff::sptr + // gr::gnuradio/blocks::complex_to_float_ff::sptr typedef boost::shared_ptr<complex_to_float> sptr; /*! diff --git a/gr-blocks/include/blocks/complex_to_imag.h b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h index cb1d32fec..7a8d20063 100644 --- a/gr-blocks/include/blocks/complex_to_imag.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H #define INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief complex in, imag out (float) * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_imag : virtual public gr_sync_block + class BLOCKS_API complex_to_imag : virtual public sync_block { public: - // gr::blocks::complex_to_imag_ff::sptr + // gr::gnuradio/blocks::complex_to_imag_ff::sptr typedef boost::shared_ptr<complex_to_imag> sptr; /*! diff --git a/gr-blocks/include/blocks/complex_to_interleaved_short.h b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h index c7304787a..8be4f8662 100644 --- a/gr-blocks/include/blocks/complex_to_interleaved_short.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H #define INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H -#include <blocks/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of complex to a stream of interleaved shorts * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_interleaved_short : virtual public gr_sync_interpolator + class BLOCKS_API complex_to_interleaved_short : virtual public sync_interpolator { public: - // gr::blocks::complex_to_interleaved_short::sptr + // gr::gnuradio/blocks::complex_to_interleaved_short::sptr typedef boost::shared_ptr<complex_to_interleaved_short> sptr; /*! diff --git a/gr-blocks/include/blocks/complex_to_mag.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h index b1758fd3e..fcb1fe66c 100644 --- a/gr-blocks/include/blocks/complex_to_mag.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_H #define INCLUDED_BLOCKS_COMPLEX_TO_MAG_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief complex in, magnitude out (float) * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_mag : virtual public gr_sync_block + class BLOCKS_API complex_to_mag : virtual public sync_block { public: - // gr::blocks::complex_to_mag_ff::sptr + // gr::gnuradio/blocks::complex_to_mag_ff::sptr typedef boost::shared_ptr<complex_to_mag> sptr; /*! diff --git a/gr-blocks/include/blocks/complex_to_mag_squared.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h index a7c464fbb..662505039 100644 --- a/gr-blocks/include/blocks/complex_to_mag_squared.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H #define INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief complex in, magnitude squared out (float) * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_mag_squared : virtual public gr_sync_block + class BLOCKS_API complex_to_mag_squared : virtual public sync_block { public: - // gr::blocks::complex_to_mag_squared_ff::sptr + // gr::gnuradio/blocks::complex_to_mag_squared_ff::sptr typedef boost::shared_ptr<complex_to_mag_squared> sptr; /*! diff --git a/gr-blocks/include/blocks/complex_to_real.h b/gr-blocks/include/gnuradio/blocks/complex_to_real.h index 908ca9fc9..7efefcddd 100644 --- a/gr-blocks/include/blocks/complex_to_real.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_real.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_COMPLEX_TO_REAL_H #define INCLUDED_BLOCKS_COMPLEX_TO_REAL_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief complex in, real out (float) * \ingroup type_converters_blk */ - class BLOCKS_API complex_to_real : virtual public gr_sync_block + class BLOCKS_API complex_to_real : virtual public sync_block { public: - // gr::blocks::complex_to_real_ff::sptr + // gr::gnuradio/blocks::complex_to_real_ff::sptr typedef boost::shared_ptr<complex_to_real> sptr; /*! diff --git a/gr-blocks/include/blocks/conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h index 92096eea3..7e4440c71 100644 --- a/gr-blocks/include/blocks/conjugate_cc.h +++ b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_CONJUGATE_CC_H #define INCLUDED_BLOCKS_CONJUGATE_CC_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief output = complex conjugate of input * \ingroup math_operators_blk */ - class BLOCKS_API conjugate_cc : virtual public gr_sync_block + class BLOCKS_API conjugate_cc : virtual public sync_block { public: - // gr::blocks::conjugate_cc_ff::sptr + // gr::gnuradio/blocks::conjugate_cc_ff::sptr typedef boost::shared_ptr<conjugate_cc> sptr; static sptr make(); diff --git a/gr-blocks/include/blocks/control_loop.h b/gr-blocks/include/gnuradio/blocks/control_loop.h index 7c09f5915..d53c81cba 100644 --- a/gr-blocks/include/blocks/control_loop.h +++ b/gr-blocks/include/gnuradio/blocks/control_loop.h @@ -23,7 +23,7 @@ #ifndef GR_BLOCKS_CONTROL_LOOP #define GR_BLOCKS_CONTROL_LOOP -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> namespace gr { namespace blocks { diff --git a/gr-blocks/include/blocks/copy.h b/gr-blocks/include/gnuradio/blocks/copy.h index a243a5491..f960d4fba 100644 --- a/gr-blocks/include/blocks/copy.h +++ b/gr-blocks/include/gnuradio/blocks/copy.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_COPY_H #define INCLUDED_GR_COPY_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * When enabled (default), this block copies its input to its * output. When disabled, this block drops its input on the floor. */ - class BLOCKS_API copy : virtual public gr_block + class BLOCKS_API copy : virtual public block { public: - // gr::blocks::copy::sptr + // gr::gnuradio/blocks::copy::sptr typedef boost::shared_ptr<copy> sptr; static sptr make(size_t itemsize); diff --git a/gr-blocks/include/blocks/count_bits.h b/gr-blocks/include/gnuradio/blocks/count_bits.h index ceb882f67..88f56f722 100644 --- a/gr-blocks/include/blocks/count_bits.h +++ b/gr-blocks/include/gnuradio/blocks/count_bits.h @@ -23,7 +23,7 @@ #ifndef _GR_COUNT_BITS_H_ #define _GR_COUNT_BITS_H_ -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> namespace gr { namespace blocks { diff --git a/gr-blocks/include/blocks/ctrlport_probe2_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h index 736c23e4e..c15635bc2 100644 --- a/gr-blocks/include/blocks/ctrlport_probe2_c.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_CTRLPORT_PROBE2_C_H #define INCLUDED_CTRLPORT_PROBE2_C_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -40,10 +40,10 @@ namespace gr { * the latest \p len number of complex samples so that every query * by a ControlPort client will get the same length vector. */ - class BLOCKS_API ctrlport_probe2_c : virtual public gr_sync_block + class BLOCKS_API ctrlport_probe2_c : virtual public sync_block { public: - // gr::blocks::ctrlport_probe2_c::sptr + // gr::gnuradio/blocks::ctrlport_probe2_c::sptr typedef boost::shared_ptr<ctrlport_probe2_c> sptr; /*! diff --git a/gr-blocks/include/blocks/ctrlport_probe_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h index 579621c68..88eed7e5d 100644 --- a/gr-blocks/include/blocks/ctrlport_probe_c.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_CTRLPORT_PROBE_C_H #define INCLUDED_CTRLPORT_PROBE_C_H -#include <blocks/api.h> -#include <gr_sync_block.h> -#include <rpcregisterhelpers.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/rpcregisterhelpers.h> #include <boost/thread/shared_mutex.hpp> namespace gr { @@ -42,10 +42,10 @@ namespace gr { * sends the current vector held in the work function when the * queried by a ControlPort client. */ - class BLOCKS_API ctrlport_probe_c : virtual public gr_sync_block + class BLOCKS_API ctrlport_probe_c : virtual public sync_block { public: - // gr::blocks::ctrlport_probe_c::sptr + // gr::gnuradio/blocks::ctrlport_probe_c::sptr typedef boost::shared_ptr<ctrlport_probe_c> sptr; /*! diff --git a/gr-blocks/include/blocks/deinterleave.h b/gr-blocks/include/gnuradio/blocks/deinterleave.h index bb6ad59a2..e9e7ebd58 100644 --- a/gr-blocks/include/blocks/deinterleave.h +++ b/gr-blocks/include/gnuradio/blocks/deinterleave.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_DEINTERLEAVE_H #define INCLUDED_BLOCKS_DEINTERLEAVE_H -#include <blocks/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief deinterleave a single input into N outputs * \ingroup stream_operators_blk */ - class BLOCKS_API deinterleave : virtual public gr_sync_decimator + class BLOCKS_API deinterleave : virtual public sync_decimator { public: - // gr::blocks::deinterleave::sptr + // gr::gnuradio/blocks::deinterleave::sptr typedef boost::shared_ptr<deinterleave> sptr; /*! diff --git a/gr-blocks/include/blocks/delay.h b/gr-blocks/include/gnuradio/blocks/delay.h index 2a59fa0fc..8fc5bb302 100644 --- a/gr-blocks/include/blocks/delay.h +++ b/gr-blocks/include/gnuradio/blocks/delay.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_DELAY_H #define INCLUDED_BLOCKS_DELAY_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief delay the input by a certain number of samples * \ingroup misc_blk */ - class BLOCKS_API delay : virtual public gr_block + class BLOCKS_API delay : virtual public block { public: - // gr::blocks::delay::sptr + // gr::gnuradio/blocks::delay::sptr typedef boost::shared_ptr<delay> sptr; /*! diff --git a/gr-blocks/include/blocks/divide_XX.h.t b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t index 821a458ec..25e7941f7 100644 --- a/gr-blocks/include/blocks/divide_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,7 +38,7 @@ namespace gr { * \details * Divide across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/endian_swap.h b/gr-blocks/include/gnuradio/blocks/endian_swap.h index c26a1d2aa..841fc3c4b 100644 --- a/gr-blocks/include/blocks/endian_swap.h +++ b/gr-blocks/include/gnuradio/blocks/endian_swap.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_ENDIAN_SWAP_H #define INCLUDED_GR_ENDIAN_SWAP_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of items into thier byte swapped version * \ingroup stream_operators_blk */ - class BLOCKS_API endian_swap : virtual public gr_sync_block + class BLOCKS_API endian_swap : virtual public sync_block { public: - // gr::blocks::endian_swap::sptr + // gr::gnuradio/blocks::endian_swap::sptr typedef boost::shared_ptr<endian_swap> sptr; /*! diff --git a/gr-blocks/include/blocks/file_descriptor_sink.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h index e98f918c1..9a3cf2eda 100644 --- a/gr-blocks/include/blocks/file_descriptor_sink.h +++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_H #define INCLUDED_GR_FILE_DESCRIPTOR_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Write stream to file descriptor. * \ingroup file_operators_blk */ - class BLOCKS_API file_descriptor_sink : virtual public gr_sync_block + class BLOCKS_API file_descriptor_sink : virtual public sync_block { public: - // gr::blocks::file_descriptor_sink::sptr + // gr::gnuradio/blocks::file_descriptor_sink::sptr typedef boost::shared_ptr<file_descriptor_sink> sptr; /*! diff --git a/gr-blocks/include/blocks/file_descriptor_source.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h index ac827800c..24e602889 100644 --- a/gr-blocks/include/blocks/file_descriptor_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H #define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { @@ -34,7 +34,7 @@ namespace gr { * \brief Read stream from file descriptor. * \ingroup file_operators_blk */ - class BLOCKS_API file_descriptor_source : virtual public gr_sync_block + class BLOCKS_API file_descriptor_source : virtual public sync_block { protected: virtual int read_items(char *buf, int nitems) = 0; @@ -42,7 +42,7 @@ namespace gr { virtual void flush_residue() = 0; public: - // gr::blocks::file_descriptor_source::sptr + // gr::gnuradio/blocks::file_descriptor_source::sptr typedef boost::shared_ptr<file_descriptor_source> sptr; /*! diff --git a/gr-blocks/include/blocks/file_meta_sink.h b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h index 763e0a2da..10230008a 100644 --- a/gr-blocks/include/blocks/file_meta_sink.h +++ b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FILE_META_SINK_H #define INCLUDED_BLOCKS_FILE_META_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -67,10 +67,10 @@ namespace gr { * the data segment starts plus the data segment size. Following * will either be a new header or EOF. */ - class BLOCKS_API file_meta_sink : virtual public gr_sync_block + class BLOCKS_API file_meta_sink : virtual public sync_block { public: - // gr::blocks::file_meta_sink::sptr + // gr::gnuradio/blocks::file_meta_sink::sptr typedef boost::shared_ptr<file_meta_sink> sptr; /*! diff --git a/gr-blocks/include/blocks/file_meta_source.h b/gr-blocks/include/gnuradio/blocks/file_meta_source.h index 83997fc9b..38b6a43d8 100644 --- a/gr-blocks/include/blocks/file_meta_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_meta_source.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_H #define INCLUDED_BLOCKS_FILE_META_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -48,10 +48,10 @@ namespace gr { * Any item inside of the extra header dictionary is ready out and * made into a stream tag. */ - class BLOCKS_API file_meta_source : virtual public gr_sync_block + class BLOCKS_API file_meta_source : virtual public sync_block { public: - // gr::blocks::file_meta_source::sptr + // gr::gnuradio/blocks::file_meta_source::sptr typedef boost::shared_ptr<file_meta_source> sptr; /*! diff --git a/gr-blocks/include/blocks/file_sink.h b/gr-blocks/include/gnuradio/blocks/file_sink.h index c894defd7..7ea288983 100644 --- a/gr-blocks/include/blocks/file_sink.h +++ b/gr-blocks/include/gnuradio/blocks/file_sink.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_FILE_SINK_H #define INCLUDED_GR_FILE_SINK_H -#include <blocks/api.h> -#include <blocks/file_sink_base.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/blocks/file_sink_base.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -34,11 +34,11 @@ namespace gr { * \brief Write stream to file. * \ingroup file_operators_blk */ - class BLOCKS_API file_sink : virtual public gr_sync_block, + class BLOCKS_API file_sink : virtual public sync_block, virtual public file_sink_base { public: - // gr::blocks::file_sink::sptr + // gr::gnuradio/blocks::file_sink::sptr typedef boost::shared_ptr<file_sink> sptr; /*! diff --git a/gr-blocks/include/blocks/file_sink_base.h b/gr-blocks/include/gnuradio/blocks/file_sink_base.h index 3eeb0e63d..812da6dfa 100644 --- a/gr-blocks/include/blocks/file_sink_base.h +++ b/gr-blocks/include/gnuradio/blocks/file_sink_base.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_FILE_SINK_BASE_H #define INCLUDED_GR_FILE_SINK_BASE_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> #include <boost/thread.hpp> #include <cstdio> diff --git a/gr-blocks/include/blocks/file_source.h b/gr-blocks/include/gnuradio/blocks/file_source.h index 6f1bc49ea..3ed2747c3 100644 --- a/gr-blocks/include/blocks/file_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_source.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FILE_SOURCE_H #define INCLUDED_BLOCKS_FILE_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief Read stream from file * \ingroup file_operators_blk */ - class BLOCKS_API file_source : virtual public gr_sync_block + class BLOCKS_API file_source : virtual public sync_block { public: - // gr::blocks::file_source::sptr + // gr::gnuradio/blocks::file_source::sptr typedef boost::shared_ptr<file_source> sptr; /*! diff --git a/gr-blocks/include/blocks/float_to_char.h b/gr-blocks/include/gnuradio/blocks/float_to_char.h index c0193da57..593360608 100644 --- a/gr-blocks/include/blocks/float_to_char.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_char.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FLOAT_TO_CHAR_H #define INCLUDED_BLOCKS_FLOAT_TO_CHAR_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of floats to a stream of char * \ingroup type_converters_blk */ - class BLOCKS_API float_to_char : virtual public gr_sync_block + class BLOCKS_API float_to_char : virtual public sync_block { public: - // gr::blocks::float_to_char_ff::sptr + // gr::gnuradio/blocks::float_to_char_ff::sptr typedef boost::shared_ptr<float_to_char> sptr; /*! diff --git a/gr-blocks/include/blocks/float_to_complex.h b/gr-blocks/include/gnuradio/blocks/float_to_complex.h index aba9aed8c..c8a97f1fb 100644 --- a/gr-blocks/include/blocks/float_to_complex.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_complex.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H #define INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief one or two floats in, complex out * \ingroup type_converters_blk */ - class BLOCKS_API float_to_complex : virtual public gr_sync_block + class BLOCKS_API float_to_complex : virtual public sync_block { public: - // gr::blocks::float_to_complex_ff::sptr + // gr::gnuradio/blocks::float_to_complex_ff::sptr typedef boost::shared_ptr<float_to_complex> sptr; /*! diff --git a/gr-blocks/include/blocks/float_to_int.h b/gr-blocks/include/gnuradio/blocks/float_to_int.h index 3c8e7ad5a..0d82b7e5c 100644 --- a/gr-blocks/include/blocks/float_to_int.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_int.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FLOAT_TO_INT_H #define INCLUDED_BLOCKS_FLOAT_TO_INT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of floats to a stream of ints. * \ingroup type_converters_blk */ - class BLOCKS_API float_to_int : virtual public gr_sync_block + class BLOCKS_API float_to_int : virtual public sync_block { public: - // gr::blocks::float_to_int_ff::sptr + // gr::gnuradio/blocks::float_to_int_ff::sptr typedef boost::shared_ptr<float_to_int> sptr; /*! diff --git a/gr-blocks/include/blocks/float_to_short.h b/gr-blocks/include/gnuradio/blocks/float_to_short.h index 8f5f60e55..ad62189dd 100644 --- a/gr-blocks/include/blocks/float_to_short.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_short.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FLOAT_TO_SHORT_H #define INCLUDED_BLOCKS_FLOAT_TO_SHORT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of floats to a stream of shorts * \ingroup type_converters_blk */ - class BLOCKS_API float_to_short : virtual public gr_sync_block + class BLOCKS_API float_to_short : virtual public sync_block { public: - // gr::blocks::float_to_short_ff::sptr + // gr::gnuradio/blocks::float_to_short_ff::sptr typedef boost::shared_ptr<float_to_short> sptr; /*! diff --git a/gr-blocks/include/blocks/float_to_uchar.h b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h index 9bfaaa65a..3a34079bc 100644 --- a/gr-blocks/include/blocks/float_to_uchar.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H #define INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief Convert stream of floats to a stream of unsigned chars * \ingroup type_converters_blk */ - class BLOCKS_API float_to_uchar : virtual public gr_sync_block + class BLOCKS_API float_to_uchar : virtual public sync_block { public: - // gr::blocks::float_to_uchar_ff::sptr + // gr::gnuradio/blocks::float_to_uchar_ff::sptr typedef boost::shared_ptr<float_to_uchar> sptr; /*! diff --git a/gr-blocks/include/blocks/head.h b/gr-blocks/include/gnuradio/blocks/head.h index 4693f988b..f4a870908 100644 --- a/gr-blocks/include/blocks/head.h +++ b/gr-blocks/include/gnuradio/blocks/head.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_HEAD_H #define INCLUDED_GR_HEAD_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> #include <stddef.h> // size_t namespace gr { @@ -37,10 +37,10 @@ namespace gr { * \details * Useful for building test cases */ - class BLOCKS_API head : virtual public gr_sync_block + class BLOCKS_API head : virtual public sync_block { public: - // gr::blocks::head::sptr + // gr::gnuradio/blocks::head::sptr typedef boost::shared_ptr<head> sptr; static sptr make(size_t sizeof_stream_item, diff --git a/gr-blocks/include/blocks/int_to_float.h b/gr-blocks/include/gnuradio/blocks/int_to_float.h index 179667e4d..6813449a9 100644 --- a/gr-blocks/include/blocks/int_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/int_to_float.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_INT_TO_FLOAT_H #define INCLUDED_BLOCKS_INT_TO_FLOAT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of ints to a stream of floats. * \ingroup type_converters_blk */ - class BLOCKS_API int_to_float : virtual public gr_sync_block + class BLOCKS_API int_to_float : virtual public sync_block { public: - // gr::blocks::int_to_float_ff::sptr + // gr::gnuradio/blocks::int_to_float_ff::sptr typedef boost::shared_ptr<int_to_float> sptr; /*! diff --git a/gr-blocks/include/blocks/integrate_XX.h.t b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t index 45a49def0..343ab1ef6 100644 --- a/gr-blocks/include/blocks/integrate_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief Integrate successive samples and decimate * \ingroup math_operators_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_decimator + class BLOCKS_API @NAME@ : virtual public sync_decimator { public: diff --git a/gr-blocks/include/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h index 043ad6d27..a2aa2fc6c 100644 --- a/gr-blocks/include/blocks/interleave.h +++ b/gr-blocks/include/gnuradio/blocks/interleave.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_INTERLEAVE_H #define INCLUDED_BLOCKS_INTERLEAVE_H -#include <blocks/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief interleave N inputs into a single output * \ingroup stream_operators_blk */ - class BLOCKS_API interleave : virtual public gr_sync_interpolator + class BLOCKS_API interleave : virtual public sync_interpolator { public: - // gr::blocks::interleave::sptr + // gr::gnuradio/blocks::interleave::sptr typedef boost::shared_ptr<interleave> sptr; /*! diff --git a/gr-blocks/include/blocks/interleaved_short_to_complex.h b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h index 44b6dfcdf..38caaf7ff 100644 --- a/gr-blocks/include/blocks/interleaved_short_to_complex.h +++ b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H #define INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H -#include <blocks/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of interleaved shorts to a stream of complex * \ingroup type_converters_blk */ - class BLOCKS_API interleaved_short_to_complex : virtual public gr_sync_decimator + class BLOCKS_API interleaved_short_to_complex : virtual public sync_decimator { public: - // gr::blocks::interleaved_short_to_complex::sptr + // gr::gnuradio/blocks::interleaved_short_to_complex::sptr typedef boost::shared_ptr<interleaved_short_to_complex> sptr; /*! diff --git a/gr-blocks/include/blocks/keep_m_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h index 88d94fab8..4a1de4833 100644 --- a/gr-blocks/include/blocks/keep_m_in_n.h +++ b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_KEEP_M_IN_N_H #define INCLUDED_BLOCKS_KEEP_M_IN_N_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief decimate a stream, keeping \p m items out of every \p n. * \ingroup stream_operators_blk */ - class BLOCKS_API keep_m_in_n : virtual public gr_block + class BLOCKS_API keep_m_in_n : virtual public block { public: - // gr::blocks::keep_m_in_n::sptr + // gr::gnuradio/blocks::keep_m_in_n::sptr typedef boost::shared_ptr<keep_m_in_n> sptr; /*! diff --git a/gr-blocks/include/blocks/keep_one_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h index 9cce1e93e..bc63bf938 100644 --- a/gr-blocks/include/blocks/keep_one_in_n.h +++ b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_KEEP_ONE_IN_N_H #define INCLUDED_BLOCKS_KEEP_ONE_IN_N_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief decimate a stream, keeping one item out of every \p n. * \ingroup stream_operators_blk */ - class BLOCKS_API keep_one_in_n : virtual public gr_block + class BLOCKS_API keep_one_in_n : virtual public block { public: - // gr::blocks::keep_one_in_n::sptr + // gr::gnuradio/blocks::keep_one_in_n::sptr typedef boost::shared_ptr<keep_one_in_n> sptr; /*! diff --git a/gr-blocks/include/blocks/lfsr_15_1_0.h b/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h index b90684458..2ebfe0831 100644 --- a/gr-blocks/include/blocks/lfsr_15_1_0.h +++ b/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GRI_LFSR_15_1_0_H #define INCLUDED_GRI_LFSR_15_1_0_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> namespace gr { namespace blocks { diff --git a/gr-blocks/include/blocks/lfsr_32k.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k.h index 23954139d..502efebc5 100644 --- a/gr-blocks/include/blocks/lfsr_32k.h +++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GRI_LFSR_32k_H #define INCLUDED_GRI_LFSR_32k_H -#include <blocks/api.h> -#include <blocks/lfsr_15_1_0.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/blocks/lfsr_15_1_0.h> namespace gr { namespace blocks { diff --git a/gr-blocks/include/blocks/lfsr_32k_source_s.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h index 843c7a57e..619e9a424 100644 --- a/gr-blocks/include/blocks/lfsr_32k_source_s.h +++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_H #define INCLUDED_GR_LFSR_32K_SOURCE_S_H -#include <blocks/api.h> -#include <blocks/lfsr_32k.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/blocks/lfsr_32k.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,10 +38,10 @@ namespace gr { * This source is typically used along with gr::blocks::check_lfsr_32k_s to * test the USRP using its digital loopback mode. */ - class BLOCKS_API lfsr_32k_source_s : virtual public gr_sync_block + class BLOCKS_API lfsr_32k_source_s : virtual public sync_block { public: - // gr::blocks::lfsr_32k_source_s::sptr + // gr::gnuradio/blocks::lfsr_32k_source_s::sptr typedef boost::shared_ptr<lfsr_32k_source_s> sptr; /*! diff --git a/gr-blocks/include/blocks/log2_const.h b/gr-blocks/include/gnuradio/blocks/log2_const.h index 67d63810f..c2526e76e 100644 --- a/gr-blocks/include/blocks/log2_const.h +++ b/gr-blocks/include/gnuradio/blocks/log2_const.h @@ -27,7 +27,7 @@ #ifndef INCLUDED_BLOCKS_LOG2_CONST_H #define INCLUDED_BLOCKS_LOG2_CONST_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> #include <assert.h> namespace gr { diff --git a/gr-blocks/include/blocks/max_XX.h.t b/gr-blocks/include/gnuradio/blocks/max_XX.h.t index 738d7bb93..44b3ad487 100644 --- a/gr-blocks/include/blocks/max_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/max_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -43,7 +43,7 @@ namespace gr { * Stream 0 will contain the index value in the vector where * the maximum value occurred. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/message_burst_source.h b/gr-blocks/include/gnuradio/blocks/message_burst_source.h index 72997abf2..0e7527cbe 100644 --- a/gr-blocks/include/blocks/message_burst_source.h +++ b/gr-blocks/include/gnuradio/blocks/message_burst_source.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_MESSAGE_BURST_SOURCE_H #define INCLUDED_GR_MESSAGE_BURST_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace blocks { @@ -34,16 +34,16 @@ namespace gr { * \brief Turn received messages into a stream and tag them for UHD to send. * \ingroup message_tools_blk */ - class BLOCKS_API message_burst_source : virtual public gr_sync_block + class BLOCKS_API message_burst_source : virtual public sync_block { public: - // gr::blocks::message_source::sptr + // gr::gnuradio/blocks::message_source::sptr typedef boost::shared_ptr<message_burst_source> sptr; static sptr make(size_t itemsize, int msgq_limit); - static sptr make(size_t itemsize, gr_msg_queue_sptr msgq); + static sptr make(size_t itemsize, gr::msg_queue::sptr msgq); - virtual gr_msg_queue_sptr msgq() const = 0; + virtual gr::msg_queue::sptr msgq() const = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/message_debug.h b/gr-blocks/include/gnuradio/blocks/message_debug.h index 59a778ba4..cc9612542 100644 --- a/gr-blocks/include/blocks/message_debug.h +++ b/gr-blocks/include/gnuradio/blocks/message_debug.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MESSAGE_DEBUG_H #define INCLUDED_GR_MESSAGE_DEBUG_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -48,10 +48,10 @@ namespace gr { * \li print_pdu: specifically designed to handle formatted PDUs * (see pdu.h). */ - class BLOCKS_API message_debug : virtual public gr_block + class BLOCKS_API message_debug : virtual public block { public: - // gr::blocks::message_debug::sptr + // gr::gnuradio/blocks::message_debug::sptr typedef boost::shared_ptr<message_debug> sptr; /*! diff --git a/gr-blocks/include/blocks/message_sink.h b/gr-blocks/include/gnuradio/blocks/message_sink.h index aec636e3c..60eaa8449 100644 --- a/gr-blocks/include/blocks/message_sink.h +++ b/gr-blocks/include/gnuradio/blocks/message_sink.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_MESSAGE_SINK_H #define INCLUDED_GR_MESSAGE_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace blocks { @@ -34,14 +34,14 @@ namespace gr { * \brief Gather received items into messages and insert into msgq * \ingroup message_tools_blk */ - class BLOCKS_API message_sink : virtual public gr_sync_block + class BLOCKS_API message_sink : virtual public sync_block { public: - // gr::blocks::message_sink::sptr + // gr::gnuradio/blocks::message_sink::sptr typedef boost::shared_ptr<message_sink> sptr; - static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block); - static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block, + static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, bool dont_block); + static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, bool dont_block, const std::string& lengthtagname); }; diff --git a/gr-blocks/include/blocks/message_source.h b/gr-blocks/include/gnuradio/blocks/message_source.h index 2aa3ddaa3..af21d7333 100644 --- a/gr-blocks/include/blocks/message_source.h +++ b/gr-blocks/include/gnuradio/blocks/message_source.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_MESSAGE_SOURCE_H #define INCLUDED_GR_MESSAGE_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace blocks { @@ -34,18 +34,18 @@ namespace gr { * \brief Turn received messages into a stream * \ingroup message_tools_blk */ - class BLOCKS_API message_source : virtual public gr_sync_block + class BLOCKS_API message_source : virtual public sync_block { public: - // gr::blocks::message_source::sptr + // gr::gnuradio/blocks::message_source::sptr typedef boost::shared_ptr<message_source> sptr; static sptr make(size_t itemsize, int msgq_limit=0); - static sptr make(size_t itemsize, gr_msg_queue_sptr msgq); - static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, + static sptr make(size_t itemsize, gr::msg_queue::sptr msgq); + static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, const std::string& lengthtagname); - virtual gr_msg_queue_sptr msgq() const = 0; + virtual gr::msg_queue::sptr msgq() const = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/message_strobe.h b/gr-blocks/include/gnuradio/blocks/message_strobe.h index abd9b7359..07b6833b4 100644 --- a/gr-blocks/include/blocks/message_strobe.h +++ b/gr-blocks/include/gnuradio/blocks/message_strobe.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MESSAGE_STROBE_H #define INCLUDED_GR_MESSAGE_STROBE_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * Takes a PMT message and sends it out every \p period_ms * milliseconds. Useful for testing/debugging the message system. */ - class BLOCKS_API message_strobe : virtual public gr_block + class BLOCKS_API message_strobe : virtual public block { public: - // gr::blocks::message_strobe::sptr + // gr::gnuradio/blocks::message_strobe::sptr typedef boost::shared_ptr<message_strobe> sptr; /*! diff --git a/gr-blocks/include/blocks/moving_average_XX.h.t b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t index 5b996bd4d..37472f70d 100644 --- a/gr-blocks/include/blocks/moving_average_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief output is the moving sum of the last N samples, scaled by the scale factor * \ingroup level_controllers_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/multiply_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t index 4ad25d35e..1071b5b5c 100644 --- a/gr-blocks/include/blocks/multiply_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,7 +38,7 @@ namespace gr { * \details * Multiply across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/multiply_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_cc.h index 79533c2dc..c6116b645 100644 --- a/gr-blocks/include/blocks/multiply_cc.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MULTIPLY_CC_H #define INCLUDED_GR_MULTIPLY_CC_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -36,11 +36,11 @@ namespace gr { * \details * Multiply across all input streams. */ - class BLOCKS_API multiply_cc : virtual public gr_sync_block + class BLOCKS_API multiply_cc : virtual public sync_block { public: - // gr::blocks::multiply_cc::sptr + // gr::gnuradio/blocks::multiply_cc::sptr typedef boost::shared_ptr<multiply_cc> sptr; /*! diff --git a/gr-blocks/include/blocks/multiply_conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h index 7fa46f891..43101bf44 100644 --- a/gr-blocks/include/blocks/multiply_conjugate_cc.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H #define INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief Multiplies stream 0 by the complex conjugate of stream 1. * \ingroup math_operators_blk */ - class BLOCKS_API multiply_conjugate_cc : virtual public gr_sync_block + class BLOCKS_API multiply_conjugate_cc : virtual public sync_block { public: - // gr::blocks::multiply_conjugate_cc::sptr + // gr::gnuradio/blocks::multiply_conjugate_cc::sptr typedef boost::shared_ptr<multiply_conjugate_cc> sptr; /*! diff --git a/gr-blocks/include/blocks/multiply_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t index 4f5ac5c5a..d1bc76c3b 100644 --- a/gr-blocks/include/blocks/multiply_const_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief output = input * constant * \ingroup math_operators_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/multiply_const_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h index 3469b4df1..d24c1135c 100644 --- a/gr-blocks/include/blocks/multiply_const_cc.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h @@ -25,8 +25,8 @@ #ifndef INCLUDED_MULTIPLY_CONST_CC_H #define INCLUDED_MULTIPLY_CONST_CC_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,12 +35,12 @@ namespace gr { * \brief output = input * complex constant * \ingroup math_operators_blk */ - class BLOCKS_API multiply_const_cc : virtual public gr_sync_block + class BLOCKS_API multiply_const_cc : virtual public sync_block { public: - // gr::blocks::multiply_const_cc::sptr + // gr::gnuradio/blocks::multiply_const_cc::sptr typedef boost::shared_ptr<multiply_const_cc> sptr; /*! diff --git a/gr-blocks/include/blocks/multiply_const_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h index 627e0c39a..0fc81dc38 100644 --- a/gr-blocks/include/blocks/multiply_const_ff.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h @@ -25,8 +25,8 @@ #ifndef INCLUDED_MULTIPLY_CONST_FF_H #define INCLUDED_MULTIPLY_CONST_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,12 +35,12 @@ namespace gr { * \brief output = input * real constant * \ingroup math_operators_blk */ - class BLOCKS_API multiply_const_ff : virtual public gr_sync_block + class BLOCKS_API multiply_const_ff : virtual public sync_block { public: - // gr::blocks::multiply_const_ff::sptr + // gr::gnuradio/blocks::multiply_const_ff::sptr typedef boost::shared_ptr<multiply_const_ff> sptr; /*! diff --git a/gr-blocks/include/blocks/multiply_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t index e9eb66083..ed180dba3 100644 --- a/gr-blocks/include/blocks/multiply_const_vXX.h.t +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief output = input * constant vector (element-wise) * \ingroup math_operators_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/multiply_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_ff.h index ef3f5109b..b7ee6ca43 100644 --- a/gr-blocks/include/blocks/multiply_ff.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MULTIPLY_FF_H #define INCLUDED_GR_MULTIPLY_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -36,11 +36,11 @@ namespace gr { * \details * Multiply across all input streams. */ - class BLOCKS_API multiply_ff : virtual public gr_sync_block + class BLOCKS_API multiply_ff : virtual public sync_block { public: - // gr::blocks::multiply_ff::sptr + // gr::gnuradio/blocks::multiply_ff::sptr typedef boost::shared_ptr<multiply_ff> sptr; /*! diff --git a/gr-blocks/include/blocks/mute_XX.h.t b/gr-blocks/include/gnuradio/blocks/mute_XX.h.t index b9a394df2..ab246c54b 100644 --- a/gr-blocks/include/blocks/mute_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/mute_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief output = input or zero if muted. * \ingroup level_controllers_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/nlog10_ff.h b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h index 7c4dfd896..642cf987b 100644 --- a/gr-blocks/include/blocks/nlog10_ff.h +++ b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_NLOG10_FF_H #define INCLUDED_BLOCKS_NLOG10_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,11 +33,11 @@ namespace gr { * \brief output = n*log10(input) + k * \ingroup math_operators_blk */ - class BLOCKS_API nlog10_ff : virtual public gr_sync_block + class BLOCKS_API nlog10_ff : virtual public sync_block { public: - // gr::blocks::nlog10_ff::sptr + // gr::gnuradio/blocks::nlog10_ff::sptr typedef boost::shared_ptr<nlog10_ff> sptr; /*! diff --git a/gr-blocks/include/blocks/nop.h b/gr-blocks/include/gnuradio/blocks/nop.h index a75adad62..20ca0532a 100644 --- a/gr-blocks/include/blocks/nop.h +++ b/gr-blocks/include/gnuradio/blocks/nop.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_NOP_H #define INCLUDED_GR_NOP_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> #include <stddef.h> // size_t namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \brief Does nothing. Used for testing only. * \ingroup misc_blk */ - class BLOCKS_API nop : virtual public gr_block + class BLOCKS_API nop : virtual public block { public: - // gr::blocks::nop::sptr + // gr::gnuradio/blocks::nop::sptr typedef boost::shared_ptr<nop> sptr; /*! diff --git a/gr-blocks/include/blocks/not_XX.h.t b/gr-blocks/include/gnuradio/blocks/not_XX.h.t index fc0632772..2c32237ce 100644 --- a/gr-blocks/include/blocks/not_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/not_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,7 +37,7 @@ namespace gr { * * bitwise boolean not of input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/null_sink.h b/gr-blocks/include/gnuradio/blocks/null_sink.h index 8e772ab61..840d58aad 100644 --- a/gr-blocks/include/blocks/null_sink.h +++ b/gr-blocks/include/gnuradio/blocks/null_sink.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_NULL_SINK_H #define INCLUDED_GR_NULL_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> #include <stddef.h> // size_t namespace gr { @@ -35,10 +35,10 @@ namespace gr { * required and we don't want to do anything real. * \ingroup misc_blk */ - class BLOCKS_API null_sink : virtual public gr_sync_block + class BLOCKS_API null_sink : virtual public sync_block { public: - // gr::blocks::null_sink::sptr + // gr::gnuradio/blocks::null_sink::sptr typedef boost::shared_ptr<null_sink> sptr; /*! diff --git a/gr-blocks/include/blocks/null_source.h b/gr-blocks/include/gnuradio/blocks/null_source.h index fc782c1cb..387c649f4 100644 --- a/gr-blocks/include/blocks/null_source.h +++ b/gr-blocks/include/gnuradio/blocks/null_source.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_NULL_SOURCE_H #define INCLUDED_GR_NULL_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief A source of zeros used mainly for testing. * \ingroup misc_blk */ - class BLOCKS_API null_source : virtual public gr_sync_block + class BLOCKS_API null_source : virtual public sync_block { public: - // gr::blocks::null_source::sptr + // gr::gnuradio/blocks::null_source::sptr typedef boost::shared_ptr<null_source> sptr; /*! diff --git a/gr-blocks/include/blocks/or_XX.h.t b/gr-blocks/include/gnuradio/blocks/or_XX.h.t index 67afe54ea..d485f0496 100644 --- a/gr-blocks/include/blocks/or_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/or_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,7 +37,7 @@ namespace gr { * * Bitwise boolean or across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/pack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h index 41ae4bc41..584ea6361 100644 --- a/gr-blocks/include/blocks/pack_k_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_PACK_K_BITS_BB_H #define INCLUDED_GR_PACK_K_BITS_BB_H -#include <blocks/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace blocks { @@ -34,10 +34,10 @@ namespace gr { * byte with k relevent bits. * \ingroup byte_operators_blk */ - class BLOCKS_API pack_k_bits_bb : virtual public gr_sync_decimator + class BLOCKS_API pack_k_bits_bb : virtual public sync_decimator { public: - // gr::blocks::pack_k_bits_bb::sptr + // gr::gnuradio/blocks::pack_k_bits_bb::sptr typedef boost::shared_ptr<pack_k_bits_bb> sptr; /*! diff --git a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t index d8edba229..98b7df265 100644 --- a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_block.h> -#include <gr_endianness.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> +#include <gnuradio/endianness.h> namespace gr { namespace blocks { @@ -58,14 +58,14 @@ namespace gr { * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc. * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc. */ - class BLOCKS_API @NAME@ : virtual public gr_block + class BLOCKS_API @NAME@ : virtual public block { public: // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; static sptr make(unsigned int bits_per_chunk, - gr_endianness_t endianness); + endianness_t endianness); }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/patterned_interleaver.h b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h index 01e9a0d58..ad3d1e9c8 100644 --- a/gr-blocks/include/blocks/patterned_interleaver.h +++ b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H #define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,7 +33,7 @@ namespace gr { * \brief Interleave items based on the provided vector \p pattern. * \ingroup stream_operators_blk */ - class BLOCKS_API patterned_interleaver : virtual public gr_block + class BLOCKS_API patterned_interleaver : virtual public block { public: typedef boost::shared_ptr<patterned_interleaver> sptr; diff --git a/gr-blocks/include/blocks/pdu.h b/gr-blocks/include/gnuradio/blocks/pdu.h index 8890c5cb1..decc5e17d 100644 --- a/gr-blocks/include/blocks/pdu.h +++ b/gr-blocks/include/gnuradio/blocks/pdu.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_PDU_H #define INCLUDED_BLOCKS_PDU_H -#include <blocks/api.h> -#include <gr_complex.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/gr_complex.h> #include <pmt/pmt.h> #define PDU_PORT_ID pmt::mp("pdus") diff --git a/gr-blocks/include/blocks/pdu_to_tagged_stream.h b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h index 6a2667314..758d7412d 100644 --- a/gr-blocks/include/blocks/pdu_to_tagged_stream.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H #define INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H -#include <blocks/api.h> -#include <blocks/pdu.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/blocks/pdu.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -34,10 +34,10 @@ namespace gr { * \brief Turns received PDUs into a tagged stream of items * \ingroup message_tools_blk */ - class BLOCKS_API pdu_to_tagged_stream : virtual public gr_sync_block + class BLOCKS_API pdu_to_tagged_stream : virtual public sync_block { public: - // gr::blocks::pdu_to_tagged_stream::sptr + // gr::gnuradio/blocks::pdu_to_tagged_stream::sptr typedef boost::shared_ptr<pdu_to_tagged_stream> sptr; /*! diff --git a/gr-blocks/include/blocks/peak_detector2_fb.h b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h index aa30d46a0..84b8a74a7 100644 --- a/gr-blocks/include/blocks/peak_detector2_fb.h +++ b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_H #define INCLUDED_GR_PEAK_DETECTOR2_FB_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,10 +38,10 @@ namespace gr { * 0's. A separate debug output may be connected, to view the * internal EWMA described below. */ - class BLOCKS_API peak_detector2_fb : virtual public gr_sync_block + class BLOCKS_API peak_detector2_fb : virtual public sync_block { public: - // gr::blocks::peak_detector2_fb::sptr + // gr::gnuradio/blocks::peak_detector2_fb::sptr typedef boost::shared_ptr<peak_detector2_fb> sptr; /*! diff --git a/gr-blocks/include/blocks/peak_detector_XX.h.t b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t index 8d42f42ea..6bf14320a 100644 --- a/gr-blocks/include/blocks/peak_detector_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -39,7 +39,7 @@ namespace gr { * If a peak is detected, this block outputs a 1, * or it outputs 0's. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/plateau_detector_fb.h b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h index 119262d39..3f5ea189e 100644 --- a/gr-blocks/include/blocks/plateau_detector_fb.h +++ b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h @@ -24,8 +24,8 @@ #ifndef INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H #define INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -51,7 +51,7 @@ namespace gr { * An implicit hysteresis is provided by the fact that after detecting one plateau, * it waits at least max_len samples before the next plateau can be detected. */ - class BLOCKS_API plateau_detector_fb : virtual public gr_sync_block + class BLOCKS_API plateau_detector_fb : virtual public sync_block { public: typedef boost::shared_ptr<plateau_detector_fb> sptr; diff --git a/gr-blocks/include/blocks/probe_rate.h b/gr-blocks/include/gnuradio/blocks/probe_rate.h index fc0b9f29d..7789de192 100644 --- a/gr-blocks/include/blocks/probe_rate.h +++ b/gr-blocks/include/gnuradio/blocks/probe_rate.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_PROBE_RATE_H #define INCLUDED_BLOCKS_PROBE_RATE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief throughput measurement * \ingroup measurement_tools_blk */ - class BLOCKS_API probe_rate : virtual public gr_sync_block + class BLOCKS_API probe_rate : virtual public sync_block { public: - // gr::blocks::probe_rate::sptr + // gr::gnuradio/blocks::probe_rate::sptr typedef boost::shared_ptr<probe_rate> sptr; /*! diff --git a/gr-blocks/include/blocks/probe_signal_X.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t index fb0d84bb4..5398411a7 100644 --- a/gr-blocks/include/blocks/probe_signal_X.h.t +++ b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief Sink that allows a sample to be grabbed from Python. * \ingroup measurement_tools_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/probe_signal_vX.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t index 77462dc65..05e013795 100644 --- a/gr-blocks/include/blocks/probe_signal_vX.h.t +++ b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t @@ -26,8 +26,8 @@ #define @GUARD_NAME@ #include <vector> -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,7 +37,7 @@ namespace gr { * \ingroup sink_blk * \ingroup measurement_tools_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/random_pdu.h b/gr-blocks/include/gnuradio/blocks/random_pdu.h index 6cc7afaae..6ffdd86a9 100644 --- a/gr-blocks/include/blocks/random_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/random_pdu.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_RANDOM_PDU_H #define INCLUDED_BLOCKS_RANDOM_PDU_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -34,10 +34,10 @@ namespace gr { * \ingroup message_tools_blk * \ingroup debug_tools_blk */ - class BLOCKS_API random_pdu : virtual public gr_block + class BLOCKS_API random_pdu : virtual public block { public: - // gr::blocks::random_pdu::sptr + // gr::gnuradio/blocks::random_pdu::sptr typedef boost::shared_ptr<random_pdu> sptr; /*! diff --git a/gr-blocks/include/blocks/regenerate_bb.h b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h index a2cc76737..0ff8b4c9d 100644 --- a/gr-blocks/include/blocks/regenerate_bb.h +++ b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_REGENERATE_BB_H #define INCLUDED_GR_REGENERATE_BB_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -41,10 +41,10 @@ namespace gr { * Note that if max_regen=(-1)/ULONG_MAX then the regeneration * will run forever. */ - class BLOCKS_API regenerate_bb : virtual public gr_sync_block + class BLOCKS_API regenerate_bb : virtual public sync_block { public: - // gr::blocks::regenerate_bb::sptr + // gr::gnuradio/blocks::regenerate_bb::sptr typedef boost::shared_ptr<regenerate_bb> sptr; /*! diff --git a/gr-blocks/include/blocks/repack_bits_bb.h b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h index f33d4bdf8..c594966e6 100644 --- a/gr-blocks/include/blocks/repack_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_REPACK_BITS_BB_H #define INCLUDED_BLOCKS_REPACK_BITS_BB_H -#include <blocks/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/tagged_stream_block.h> namespace gr { namespace blocks { @@ -44,7 +44,7 @@ namespace gr { * bits is not an integer multiple of \p l, or bits are truncated from the input * if \p align_output is set to true. */ - class BLOCKS_API repack_bits_bb : virtual public gr_tagged_stream_block + class BLOCKS_API repack_bits_bb : virtual public tagged_stream_block { public: typedef boost::shared_ptr<repack_bits_bb> sptr; diff --git a/gr-blocks/include/blocks/repeat.h b/gr-blocks/include/gnuradio/blocks/repeat.h index b35320554..50a3daf38 100644 --- a/gr-blocks/include/blocks/repeat.h +++ b/gr-blocks/include/gnuradio/blocks/repeat.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_REPEAT_H #define INCLUDED_BLOCKS_REPEAT_H -#include <blocks/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief repeat each input \p repeat times * \ingroup stream_operators_blk */ - class BLOCKS_API repeat : virtual public gr_sync_interpolator + class BLOCKS_API repeat : virtual public sync_interpolator { public: - // gr::blocks::repeat::sptr + // gr::gnuradio/blocks::repeat::sptr typedef boost::shared_ptr<repeat> sptr; /*! diff --git a/gr-blocks/include/blocks/rms_cf.h b/gr-blocks/include/gnuradio/blocks/rms_cf.h index 94a17f7a6..f10a19521 100644 --- a/gr-blocks/include/blocks/rms_cf.h +++ b/gr-blocks/include/gnuradio/blocks/rms_cf.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_RMS_CF_H #define INCLUDED_BLOCKS_RMS_CF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief RMS average power * \ingroup math_operators_blk */ - class BLOCKS_API rms_cf : virtual public gr_sync_block + class BLOCKS_API rms_cf : virtual public sync_block { public: - // gr::blocks::rms_cf::sptr + // gr::gnuradio/blocks::rms_cf::sptr typedef boost::shared_ptr<rms_cf> sptr; /*! diff --git a/gr-blocks/include/blocks/rms_ff.h b/gr-blocks/include/gnuradio/blocks/rms_ff.h index e202d79f2..60b0c50f9 100644 --- a/gr-blocks/include/blocks/rms_ff.h +++ b/gr-blocks/include/gnuradio/blocks/rms_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_RMS_FF_H #define INCLUDED_BLOCKS_RMS_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief RMS average power * \ingroup math_operators_blk */ - class BLOCKS_API rms_ff : virtual public gr_sync_block + class BLOCKS_API rms_ff : virtual public sync_block { public: - // gr::blocks::rms_ff::sptr + // gr::gnuradio/blocks::rms_ff::sptr typedef boost::shared_ptr<rms_ff> sptr; /*! diff --git a/gr-blocks/include/blocks/rotator.h b/gr-blocks/include/gnuradio/blocks/rotator.h index 918e86edd..975bfc62a 100644 --- a/gr-blocks/include/blocks/rotator.h +++ b/gr-blocks/include/gnuradio/blocks/rotator.h @@ -23,8 +23,8 @@ #ifndef _GR_ROTATOR_H_ #define _GR_ROTATOR_H_ -#include <blocks/api.h> -#include <gr_complex.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/gr_complex.h> namespace gr { namespace blocks { diff --git a/gr-blocks/include/blocks/sample_and_hold_XX.h.t b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t index 0d2ecdc5d..2f15b2490 100644 --- a/gr-blocks/include/blocks/sample_and_hold_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -39,7 +39,7 @@ namespace gr { * Samples the data stream (input stream 0) and holds the value if * the control signal is 1 (intput stream 1). */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/short_to_char.h b/gr-blocks/include/gnuradio/blocks/short_to_char.h index 09e784f10..f6073ea46 100644 --- a/gr-blocks/include/blocks/short_to_char.h +++ b/gr-blocks/include/gnuradio/blocks/short_to_char.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_SHORT_TO_CHAR_H #define INCLUDED_BLOCKS_SHORT_TO_CHAR_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of shorts to a stream of chars. * \ingroup type_converters_blk */ - class BLOCKS_API short_to_char : virtual public gr_sync_block + class BLOCKS_API short_to_char : virtual public sync_block { public: - // gr::blocks::short_to_char_ff::sptr + // gr::gnuradio/blocks::short_to_char_ff::sptr typedef boost::shared_ptr<short_to_char> sptr; /*! diff --git a/gr-blocks/include/blocks/short_to_float.h b/gr-blocks/include/gnuradio/blocks/short_to_float.h index ec85e892e..7d5c2caac 100644 --- a/gr-blocks/include/blocks/short_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/short_to_float.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_SHORT_TO_FLOAT_H #define INCLUDED_BLOCKS_SHORT_TO_FLOAT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of shorts to a stream of floats * \ingroup type_converters_blk */ - class BLOCKS_API short_to_float : virtual public gr_sync_block + class BLOCKS_API short_to_float : virtual public sync_block { public: - // gr::blocks::short_to_float_ff::sptr + // gr::gnuradio/blocks::short_to_float_ff::sptr typedef boost::shared_ptr<short_to_float> sptr; /*! diff --git a/gr-blocks/include/blocks/skiphead.h b/gr-blocks/include/gnuradio/blocks/skiphead.h index 27a8afea9..1d3a019d7 100644 --- a/gr-blocks/include/blocks/skiphead.h +++ b/gr-blocks/include/gnuradio/blocks/skiphead.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_SKIPHEAD_H #define INCLUDED_GR_SKIPHEAD_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> #include <stddef.h> // size_t namespace gr { @@ -38,10 +38,10 @@ namespace gr { * Useful for building test cases and sources which have metadata * or junk at the start */ - class BLOCKS_API skiphead : virtual public gr_block + class BLOCKS_API skiphead : virtual public block { public: - // gr::blocks::skiphead::sptr + // gr::gnuradio/blocks::skiphead::sptr typedef boost::shared_ptr<skiphead> sptr; static sptr make(size_t itemsize, diff --git a/gr-blocks/include/blocks/socket_pdu.h b/gr-blocks/include/gnuradio/blocks/socket_pdu.h index f72d303c7..906d1aba0 100644 --- a/gr-blocks/include/blocks/socket_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/socket_pdu.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_SOCKET_PDU_H #define INCLUDED_BLOCKS_SOCKET_PDU_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Creates socket interface and translates traffic to PDUs * \ingroup networking_tools_blk */ - class BLOCKS_API socket_pdu : virtual public gr_block + class BLOCKS_API socket_pdu : virtual public block { public: - // gr::blocks::socket_pdu::sptr + // gr::gnuradio/blocks::socket_pdu::sptr typedef boost::shared_ptr<socket_pdu> sptr; /*! diff --git a/gr-blocks/include/blocks/stream_mux.h b/gr-blocks/include/gnuradio/blocks/stream_mux.h index 0e29aab36..67f5874c3 100644 --- a/gr-blocks/include/blocks/stream_mux.h +++ b/gr-blocks/include/gnuradio/blocks/stream_mux.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_STREAM_MUX_H #define INCLUDED_BLOCKS_STREAM_MUX_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -42,11 +42,11 @@ namespace gr { * * [N0, N1, N2, ..., Nm, N0, N1, ...] */ - class BLOCKS_API stream_mux : virtual public gr_block + class BLOCKS_API stream_mux : virtual public block { public: - // gr::blocks::stream_mux::sptr + // gr::gnuradio/blocks::stream_mux::sptr typedef boost::shared_ptr<stream_mux> sptr; /*! diff --git a/gr-blocks/include/blocks/stream_to_streams.h b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h index e9b257575..cef660c3b 100644 --- a/gr-blocks/include/blocks/stream_to_streams.h +++ b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_STREAM_TO_STREAMS_H #define INCLUDED_BLOCKS_STREAM_TO_STREAMS_H -#include <blocks/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * Converts a stream of N items into N streams of 1 item. * Repeat ad infinitum. */ - class BLOCKS_API stream_to_streams : virtual public gr_sync_decimator + class BLOCKS_API stream_to_streams : virtual public sync_decimator { public: - // gr::blocks::stream_to_streams::sptr + // gr::gnuradio/blocks::stream_to_streams::sptr typedef boost::shared_ptr<stream_to_streams> sptr; /*! diff --git a/gr-blocks/include/blocks/stream_to_vector.h b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h index 98325500b..d05969394 100644 --- a/gr-blocks/include/blocks/stream_to_vector.h +++ b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h @@ -23,20 +23,20 @@ #ifndef INCLUDED_BLOCKS_STREAM_TO_VECTOR_H #define INCLUDED_BLOCKS_STREAM_TO_VECTOR_H -#include <blocks/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace blocks { /*! - * \brief convert a stream of items into a stream of blocks containing nitems_per_block + * \brief convert a stream of items into a stream of gnuradio/blocks containing nitems_per_block * \ingroup stream_operators_blk */ - class BLOCKS_API stream_to_vector : virtual public gr_sync_decimator + class BLOCKS_API stream_to_vector : virtual public sync_decimator { public: - // gr::blocks::stream_to_vector::sptr + // gr::gnuradio/blocks::stream_to_vector::sptr typedef boost::shared_ptr<stream_to_vector> sptr; /*! diff --git a/gr-blocks/include/blocks/streams_to_stream.h b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h index e677a18e2..ba6d04a38 100644 --- a/gr-blocks/include/blocks/streams_to_stream.h +++ b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_STREAMS_TO_STREAM_H #define INCLUDED_BLOCKS_STREAMS_TO_STREAM_H -#include <blocks/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * Convert N streams of 1 item into 1 stream of N items. * Repeat ad infinitum. */ - class BLOCKS_API streams_to_stream : virtual public gr_sync_interpolator + class BLOCKS_API streams_to_stream : virtual public sync_interpolator { public: - // gr::blocks::streams_to_stream::sptr + // gr::gnuradio/blocks::streams_to_stream::sptr typedef boost::shared_ptr<streams_to_stream> sptr; /*! diff --git a/gr-blocks/include/blocks/streams_to_vector.h b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h index f4df16c9f..5954bdf07 100644 --- a/gr-blocks/include/blocks/streams_to_vector.h +++ b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H #define INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief convert N streams of items to 1 stream of vector length N * \ingroup stream_operators_blk */ - class BLOCKS_API streams_to_vector : virtual public gr_sync_block + class BLOCKS_API streams_to_vector : virtual public sync_block { public: - // gr::blocks::streams_to_vector::sptr + // gr::gnuradio/blocks::streams_to_vector::sptr typedef boost::shared_ptr<streams_to_vector> sptr; /*! diff --git a/gr-blocks/include/blocks/stretch_ff.h b/gr-blocks/include/gnuradio/blocks/stretch_ff.h index 47bcb9ee8..86f366935 100644 --- a/gr-blocks/include/blocks/stretch_ff.h +++ b/gr-blocks/include/gnuradio/blocks/stretch_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_STRETCH_FF_H #define INCLUDED_GR_STRETCH_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,10 +35,10 @@ namespace gr { * signature matching by normalizing spectrum dynamic ranges. * \ingroup stream_operators_blk */ - class BLOCKS_API stretch_ff : virtual public gr_sync_block + class BLOCKS_API stretch_ff : virtual public sync_block { public: - // gr::blocks::stretch_ff::sptr + // gr::gnuradio/blocks::stretch_ff::sptr typedef boost::shared_ptr<stretch_ff> sptr; /*! diff --git a/gr-blocks/include/blocks/sub_XX.h.t b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t index db854346f..ecc55fc86 100644 --- a/gr-blocks/include/blocks/sub_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,7 +38,7 @@ namespace gr { * \details * Subtract across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/include/blocks/tag_debug.h b/gr-blocks/include/gnuradio/blocks/tag_debug.h index 8093a6152..88dfb1b72 100644 --- a/gr-blocks/include/blocks/tag_debug.h +++ b/gr-blocks/include/gnuradio/blocks/tag_debug.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_TAG_DEBUG_H #define INCLUDED_GR_TAG_DEBUG_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -50,10 +50,10 @@ namespace gr { * The tags from the last call to this work function are stored * and can be retrieved using the function 'current_tags'. */ - class BLOCKS_API tag_debug : virtual public gr_sync_block + class BLOCKS_API tag_debug : virtual public sync_block { public: - // gr::blocks::tag_debug::sptr + // gr::gnuradio/blocks::tag_debug::sptr typedef boost::shared_ptr<tag_debug> sptr; /*! @@ -66,10 +66,10 @@ namespace gr { const std::string &name); /*! - * \brief Returns a vector of gr_tag_t items as of the last call to + * \brief Returns a vector of tag_t items as of the last call to * work. */ - virtual std::vector<gr_tag_t> current_tags() = 0; + virtual std::vector<tag_t> current_tags() = 0; /*! * \brief Set the display of tags to stdout on/off. diff --git a/gr-blocks/include/gnuradio/blocks/tag_gate.h b/gr-blocks/include/gnuradio/blocks/tag_gate.h new file mode 100644 index 000000000..536330119 --- /dev/null +++ b/gr-blocks/include/gnuradio/blocks/tag_gate.h @@ -0,0 +1,56 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_BLOCKS_TAG_GATE_H +#define INCLUDED_BLOCKS_TAG_GATE_H + +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> + +namespace gr { + namespace blocks { + + /*! + * \brief Control tag propagation. + * \ingroup blocks + * + * Use this block to stop tags from propagating. + */ + class BLOCKS_API tag_gate : virtual public gr::sync_block + { + public: + typedef boost::shared_ptr<tag_gate> sptr; + + virtual void set_propagation(bool propagate_tags) = 0; + + /*! + * \param item_size Item size + * \param propagate_tags Set this to true to allow tags to pass through this block. + */ + static sptr make(size_t item_size, bool propagate_tags=false); + }; + + } // namespace blocks +} // namespace gr + +#endif /* INCLUDED_BLOCKS_TAG_GATE_H */ + diff --git a/gr-blocks/include/blocks/tagged_file_sink.h b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h index 2014b6696..287ecb824 100644 --- a/gr-blocks/include/blocks/tagged_file_sink.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_TAGGED_FILE_SINK_H #define INCLUDED_GR_TAGGED_FILE_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -45,10 +45,10 @@ namespace gr { * found, the new time is calculated based off the sample rate of * the block. */ - class BLOCKS_API tagged_file_sink : virtual public gr_sync_block + class BLOCKS_API tagged_file_sink : virtual public sync_block { public: - // gr::blocks::tagged_file_sink::sptr + // gr::gnuradio/blocks::tagged_file_sink::sptr typedef boost::shared_ptr<tagged_file_sink> sptr; /*! diff --git a/gr-blocks/include/blocks/tagged_stream_mux.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h index 2fa9b3f01..73a02f9e1 100644 --- a/gr-blocks/include/blocks/tagged_stream_mux.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h @@ -22,8 +22,8 @@ #ifndef INCLUDED_TAGGED_STREAM_MUX_H #define INCLUDED_TAGGED_STREAM_MUX_H -#include <blocks/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/tagged_stream_block.h> namespace gr { namespace blocks { @@ -42,7 +42,7 @@ namespace gr { * All other tags are propagated as expected, i.e. they stay associated * with the same input item. */ - class BLOCKS_API tagged_stream_mux : virtual public gr_tagged_stream_block + class BLOCKS_API tagged_stream_mux : virtual public tagged_stream_block { public: typedef boost::shared_ptr<tagged_stream_mux> sptr; diff --git a/gr-blocks/include/blocks/tagged_stream_to_pdu.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h index b990c44ab..9b0f24a53 100644 --- a/gr-blocks/include/blocks/tagged_stream_to_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H #define INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H -#include <blocks/api.h> -#include <blocks/pdu.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/blocks/pdu.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -34,10 +34,10 @@ namespace gr { * \brief Turns received stream data and tags into PDUs * \ingroup message_tools_blk */ - class BLOCKS_API tagged_stream_to_pdu : virtual public gr_sync_block + class BLOCKS_API tagged_stream_to_pdu : virtual public sync_block { public: - // gr::blocks::tagged_stream_to_pdu::sptr + // gr::gnuradio/blocks::tagged_stream_to_pdu::sptr typedef boost::shared_ptr<tagged_stream_to_pdu> sptr; /*! diff --git a/gr-blocks/include/blocks/threshold_ff.h b/gr-blocks/include/gnuradio/blocks/threshold_ff.h index 6a20e7ed4..253041b83 100644 --- a/gr-blocks/include/blocks/threshold_ff.h +++ b/gr-blocks/include/gnuradio/blocks/threshold_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_THRESHOLD_FF_H #define INCLUDED_GR_THRESHOLD_FF_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -38,10 +38,10 @@ namespace gr { * excedes the \p hi value, it will output a 1 until the signal * falls below the \p lo value. */ - class BLOCKS_API threshold_ff : virtual public gr_sync_block + class BLOCKS_API threshold_ff : virtual public sync_block { public: - // gr::blocks::threshold_ff::sptr + // gr::gnuradio/blocks::threshold_ff::sptr typedef boost::shared_ptr<threshold_ff> sptr; /* \brief Create a threadshold block. diff --git a/gr-blocks/include/blocks/throttle.h b/gr-blocks/include/gnuradio/blocks/throttle.h index d9d9f311c..662582e0b 100644 --- a/gr-blocks/include/blocks/throttle.h +++ b/gr-blocks/include/gnuradio/blocks/throttle.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_THROTTLE_H #define INCLUDED_GR_THROTTLE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -43,7 +43,7 @@ namespace gr { * controlled by a source or sink tied to sample clock. E.g., a * USRP or audio card. */ - class BLOCKS_API throttle : virtual public gr_sync_block + class BLOCKS_API throttle : virtual public sync_block { public: typedef boost::shared_ptr<throttle> sptr; diff --git a/gr-blocks/include/blocks/transcendental.h b/gr-blocks/include/gnuradio/blocks/transcendental.h index a3a483e8f..9d7a1e70e 100644 --- a/gr-blocks/include/blocks/transcendental.h +++ b/gr-blocks/include/gnuradio/blocks/transcendental.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_TRANSCENDENTAL_H #define INCLUDED_GR_TRANSCENDENTAL_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> #include <string> namespace gr { @@ -42,10 +42,10 @@ namespace gr { * * output[i] = trans_fcn(input[i]) */ - class BLOCKS_API transcendental : virtual public gr_sync_block + class BLOCKS_API transcendental : virtual public sync_block { public: - // gr::blocks::transcendental::sptr + // gr::gnuradio/blocks::transcendental::sptr typedef boost::shared_ptr<transcendental> sptr; static sptr make(const std::string &name, diff --git a/gr-blocks/include/blocks/tuntap_pdu.h b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h index afa03cfb8..53d9371bc 100644 --- a/gr-blocks/include/blocks/tuntap_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_TUNTAP_PDU_H #define INCLUDED_BLOCKS_TUNTAP_PDU_H -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Creates TUNTAP interface and translates traffic to PDUs * \ingroup networking_tools_blk */ - class BLOCKS_API tuntap_pdu : virtual public gr_block + class BLOCKS_API tuntap_pdu : virtual public block { public: - // gr::blocks::tuntap_pdu::sptr + // gr::gnuradio/blocks::tuntap_pdu::sptr typedef boost::shared_ptr<tuntap_pdu> sptr; /*! diff --git a/gr-blocks/include/blocks/uchar_to_float.h b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h index 725c4e502..a978a7695 100644 --- a/gr-blocks/include/blocks/uchar_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H #define INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert stream of unsigned chars to a stream of floats * \ingroup type_converters_blk */ - class BLOCKS_API uchar_to_float : virtual public gr_sync_block + class BLOCKS_API uchar_to_float : virtual public sync_block { public: - // gr::blocks::uchar_to_float_ff::sptr + // gr::gnuradio/blocks::uchar_to_float_ff::sptr typedef boost::shared_ptr<uchar_to_float> sptr; /*! diff --git a/gr-blocks/include/blocks/udp_sink.h b/gr-blocks/include/gnuradio/blocks/udp_sink.h index 953021751..d9360938e 100644 --- a/gr-blocks/include/blocks/udp_sink.h +++ b/gr-blocks/include/gnuradio/blocks/udp_sink.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_UDP_SINK_H #define INCLUDED_GR_UDP_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Write stream to an UDP socket. * \ingroup networking_tools_blk */ - class BLOCKS_API udp_sink : virtual public gr_sync_block + class BLOCKS_API udp_sink : virtual public sync_block { public: - // gr::blocks::udp_sink::sptr + // gr::gnuradio/blocks::udp_sink::sptr typedef boost::shared_ptr<udp_sink> sptr; /*! diff --git a/gr-blocks/include/blocks/udp_source.h b/gr-blocks/include/gnuradio/blocks/udp_source.h index 4681b0b54..e5534bc32 100644 --- a/gr-blocks/include/blocks/udp_source.h +++ b/gr-blocks/include/gnuradio/blocks/udp_source.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_UDP_SOURCE_H #define INCLUDED_GR_UDP_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Read stream from an UDP socket. * \ingroup networking_tools_blk */ - class BLOCKS_API udp_source : virtual public gr_sync_block + class BLOCKS_API udp_source : virtual public sync_block { public: - // gr::blocks::udp_source::sptr + // gr::gnuradio/blocks::udp_source::sptr typedef boost::shared_ptr<udp_source> sptr; /*! diff --git a/gr-blocks/include/blocks/unpack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h index a36cfb50e..942973f60 100644 --- a/gr-blocks/include/blocks/unpack_k_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_UNPACK_K_BITS_BB_H #define INCLUDED_GR_UNPACK_K_BITS_BB_H -#include <blocks/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB. * \ingroup byte_operators_blk */ - class BLOCKS_API unpack_k_bits_bb : virtual public gr_sync_interpolator + class BLOCKS_API unpack_k_bits_bb : virtual public sync_interpolator { public: - // gr::blocks::unpack_k_bits_bb::sptr + // gr::gnuradio/blocks::unpack_k_bits_bb::sptr typedef boost::shared_ptr<unpack_k_bits_bb> sptr; /*! diff --git a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t index 649b9082f..194d79e0d 100644 --- a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_block.h> -#include <gr_endianness.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> +#include <gnuradio/endianness.h> namespace gr { namespace blocks { @@ -57,14 +57,14 @@ namespace gr { * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc. * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc. */ - class BLOCKS_API @NAME@ : virtual public gr_block + class BLOCKS_API @NAME@ : virtual public block { public: // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; static sptr make(unsigned int bits_per_chunk, - gr_endianness_t endianness); + endianness_t endianness); }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/vco_f.h b/gr-blocks/include/gnuradio/blocks/vco_f.h index 7245f4c96..c0fe5cd51 100644 --- a/gr-blocks/include/blocks/vco_f.h +++ b/gr-blocks/include/gnuradio/blocks/vco_f.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_VCO_F_H #define INCLUDED_GR_VCO_F_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * \details * input: float stream of control voltages; output: float oscillator output */ - class BLOCKS_API vco_f : virtual public gr_sync_block + class BLOCKS_API vco_f : virtual public sync_block { public: - // gr::blocks::vco_f::sptr + // gr::gnuradio/blocks::vco_f::sptr typedef boost::shared_ptr<vco_f> sptr; /*! diff --git a/gr-blocks/include/blocks/vector_insert_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t index c45e5152f..8b26b0b9b 100644 --- a/gr-blocks/include/blocks/vector_insert_X.h.t +++ b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief source of @TYPE@'s that gets its data from a vector * \ingroup stream_operators_blk */ - class BLOCKS_API @NAME@ : virtual public gr_block + class BLOCKS_API @NAME@ : virtual public block { public: // gr::blocks::@NAME@::sptr diff --git a/gr-blocks/include/blocks/vector_map.h b/gr-blocks/include/gnuradio/blocks/vector_map.h index 73437b43f..d26b0c56f 100644 --- a/gr-blocks/include/blocks/vector_map.h +++ b/gr-blocks/include/gnuradio/blocks/vector_map.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_VECTOR_MAP_H #define INCLUDED_GR_VECTOR_MAP_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> #include <vector> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -45,10 +45,10 @@ namespace gr { * form (element1_mapping, element2_mapping, ...) and * element1_mapping is of the form (in_stream, in_element). */ - class BLOCKS_API vector_map : virtual public gr_sync_block + class BLOCKS_API vector_map : virtual public sync_block { public: - // gr::blocks::vector_map::sptr + // gr::gnuradio/blocks::vector_map::sptr typedef boost::shared_ptr<vector_map> sptr; /*! diff --git a/gr-blocks/include/blocks/vector_sink_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t index 1d17700f5..527ebf7df 100644 --- a/gr-blocks/include/blocks/vector_sink_X.h.t +++ b/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief @TYPE@ sink that writes to a vector * \ingroup debug_tools_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr @@ -45,7 +45,7 @@ namespace gr { virtual void reset() = 0; virtual std::vector<@TYPE@> data() const = 0; - virtual std::vector<gr_tag_t> tags() const = 0; + virtual std::vector<tag_t> tags() const = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/vector_source_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t index 8d3693f3e..7ff18ad08 100644 --- a/gr-blocks/include/blocks/vector_source_X.h.t +++ b/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { * \brief source of @TYPE@'s that gets its data from a vector * \ingroup misc_blk */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: // gr::blocks::@NAME@::sptr @@ -43,11 +43,11 @@ namespace gr { static sptr make(const std::vector<@TYPE@> &data, bool repeat=false, int vlen=1, - const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>()); + const std::vector<tag_t> &tags=std::vector<tag_t>()); virtual void rewind() = 0; virtual void set_data(const std::vector<@TYPE@> &data, - const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>()) = 0; + const std::vector<tag_t> &tags=std::vector<tag_t>()) = 0; }; } /* namespace blocks */ diff --git a/gr-blocks/include/blocks/vector_to_stream.h b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h index 2a0270428..3b08bd08b 100644 --- a/gr-blocks/include/blocks/vector_to_stream.h +++ b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h @@ -23,20 +23,20 @@ #ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAM_H #define INCLUDED_BLOCKS_VECTOR_TO_STREAM_H -#include <blocks/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace blocks { /*! - * \brief convert a stream of blocks of nitems_per_block items into a stream of items + * \brief convert a stream of gnuradio/blocks of nitems_per_block items into a stream of items * \ingroup stream_operators_blk */ - class BLOCKS_API vector_to_stream : virtual public gr_sync_interpolator + class BLOCKS_API vector_to_stream : virtual public sync_interpolator { public: - // gr::blocks::vector_to_stream::sptr + // gr::gnuradio/blocks::vector_to_stream::sptr typedef boost::shared_ptr<vector_to_stream> sptr; /*! diff --git a/gr-blocks/include/blocks/vector_to_streams.h b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h index 364bc9afb..ce10ed315 100644 --- a/gr-blocks/include/blocks/vector_to_streams.h +++ b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H #define INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -33,10 +33,10 @@ namespace gr { * \brief Convert 1 stream of vectors of length N to N streams of items * \ingroup stream_operators_blk */ - class BLOCKS_API vector_to_streams : virtual public gr_sync_block + class BLOCKS_API vector_to_streams : virtual public sync_block { public: - // gr::blocks::vector_to_streams::sptr + // gr::gnuradio/blocks::vector_to_streams::sptr typedef boost::shared_ptr<vector_to_streams> sptr; /*! diff --git a/gr-blocks/include/blocks/wavfile.h b/gr-blocks/include/gnuradio/blocks/wavfile.h index 719ef9225..f0c8a4c1e 100644 --- a/gr-blocks/include/blocks/wavfile.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile.h @@ -21,9 +21,9 @@ */ // This file stores all the RIFF file type knowledge for the wavfile_* -// blocks. +// gnuradio/blocks. -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> #include <cstdio> namespace gr { diff --git a/gr-blocks/include/blocks/wavfile_sink.h b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h index f380e055a..97550bfa9 100644 --- a/gr-blocks/include/blocks/wavfile_sink.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_WAVFILE_SINK_H #define INCLUDED_GR_WAVFILE_SINK_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * Values must be floats within [-1;1]. * Check gr_make_wavfile_sink() for extra info. */ - class BLOCKS_API wavfile_sink : virtual public gr_sync_block + class BLOCKS_API wavfile_sink : virtual public sync_block { public: - // gr::blocks::wavfile_sink::sptr + // gr::gnuradio/blocks::wavfile_sink::sptr typedef boost::shared_ptr<wavfile_sink> sptr; /* diff --git a/gr-blocks/include/blocks/wavfile_source.h b/gr-blocks/include/gnuradio/blocks/wavfile_source.h index 5332a0c20..b8fe4988f 100644 --- a/gr-blocks/include/blocks/wavfile_source.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile_source.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_WAVFILE_SOURCE_H #define INCLUDED_GR_WAVFILE_SOURCE_H -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { * Unless otherwise called, values are within [-1;1]. * Check gr_make_wavfile_source() for extra info. */ - class BLOCKS_API wavfile_source : virtual public gr_sync_block + class BLOCKS_API wavfile_source : virtual public sync_block { public: - // gr::blocks::wavfile_source::sptr + // gr::gnuradio/blocks::wavfile_source::sptr typedef boost::shared_ptr<wavfile_source> sptr; static sptr make(const char *filename, bool repeat = false); diff --git a/gr-blocks/include/blocks/xor_XX.h.t b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t index a890dbaf8..fa32192e7 100644 --- a/gr-blocks/include/blocks/xor_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <blocks/api.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { @@ -37,7 +37,7 @@ namespace gr { * * Bitwise boolean xor across all input streams. */ - class BLOCKS_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public sync_block { public: diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index bdd7ca77a..34453bca5 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -278,7 +278,8 @@ list(APPEND blocks_libs ${LOG4CPP_LIBRARIES} ) -add_library(gnuradio-blocks SHARED ${gr_blocks_sources}) +add_library(gnuradio-blocks SHARED ${gr_blocks_sources} + tag_gate_impl.cc) add_dependencies(gnuradio-blocks blocks_generated_includes) target_link_libraries(gnuradio-blocks ${blocks_libs}) diff --git a/gr-blocks/lib/add_XX_impl.cc.t b/gr-blocks/lib/add_XX_impl.cc.t index c528e2fbf..281dcea05 100644 --- a/gr-blocks/lib/add_XX_impl.cc.t +++ b/gr-blocks/lib/add_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/add_XX_impl.h.t b/gr-blocks/lib/add_XX_impl.h.t index 2e20ef5fe..22292b9fa 100644 --- a/gr-blocks/lib/add_XX_impl.h.t +++ b/gr-blocks/lib/add_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/add_const_XX_impl.cc.t b/gr-blocks/lib/add_const_XX_impl.cc.t index 7fa883f4b..87b22452d 100644 --- a/gr-blocks/lib/add_const_XX_impl.cc.t +++ b/gr-blocks/lib/add_const_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@))), + : sync_block ("@NAME@", + io_signature::make (1, 1, sizeof (@I_TYPE@)), + io_signature::make (1, 1, sizeof (@O_TYPE@))), d_k(k) { } diff --git a/gr-blocks/lib/add_const_XX_impl.h.t b/gr-blocks/lib/add_const_XX_impl.h.t index cae5ca813..e0c2ae54b 100644 --- a/gr-blocks/lib/add_const_XX_impl.h.t +++ b/gr-blocks/lib/add_const_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/add_const_vXX_impl.cc.t b/gr-blocks/lib/add_const_vXX_impl.cc.t index da76cfeef..3a7174a4e 100644 --- a/gr-blocks/lib/add_const_vXX_impl.cc.t +++ b/gr-blocks/lib/add_const_vXX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(std::vector<@O_TYPE@> k) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)*k.size()), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*k.size())), + : sync_block ("@NAME@", + io_signature::make (1, 1, sizeof (@I_TYPE@)*k.size()), + io_signature::make (1, 1, sizeof (@O_TYPE@)*k.size())), d_k(k) { } diff --git a/gr-blocks/lib/add_const_vXX_impl.h.t b/gr-blocks/lib/add_const_vXX_impl.h.t index a7a619725..6c087d946 100644 --- a/gr-blocks/lib/add_const_vXX_impl.h.t +++ b/gr-blocks/lib/add_const_vXX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/add_ff_impl.cc b/gr-blocks/lib/add_ff_impl.cc index 83359ef80..e12e86c06 100644 --- a/gr-blocks/lib/add_ff_impl.cc +++ b/gr-blocks/lib/add_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "add_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } add_ff_impl::add_ff_impl(size_t vlen) - : gr_sync_block("add_ff", - gr_make_io_signature (1, -1, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("add_ff", + io_signature::make (1, -1, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/add_ff_impl.h b/gr-blocks/lib/add_ff_impl.h index 77b90d079..237ca3721 100644 --- a/gr-blocks/lib/add_ff_impl.h +++ b/gr-blocks/lib/add_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_ADD_FF_IMPL_H #define INCLUDED_BLOCKS_ADD_FF_IMPL_H -#include <blocks/add_ff.h> +#include <gnuradio/blocks/add_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/and_XX_impl.cc.t b/gr-blocks/lib/and_XX_impl.cc.t index 3218a8c74..04d6dfe86 100644 --- a/gr-blocks/lib/and_XX_impl.cc.t +++ b/gr-blocks/lib/and_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/and_XX_impl.h.t b/gr-blocks/lib/and_XX_impl.h.t index 25f0da0c8..f7db3f216 100644 --- a/gr-blocks/lib/and_XX_impl.h.t +++ b/gr-blocks/lib/and_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/and_const_XX_impl.cc.t b/gr-blocks/lib/and_const_XX_impl.cc.t index 8ff5ac371..8eba4ed58 100644 --- a/gr-blocks/lib/and_const_XX_impl.cc.t +++ b/gr-blocks/lib/and_const_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@))), + : sync_block ("@NAME@", + io_signature::make (1, 1, sizeof (@I_TYPE@)), + io_signature::make (1, 1, sizeof (@O_TYPE@))), d_k(k) { } diff --git a/gr-blocks/lib/and_const_XX_impl.h.t b/gr-blocks/lib/and_const_XX_impl.h.t index 2c379feb8..186fda950 100644 --- a/gr-blocks/lib/and_const_XX_impl.h.t +++ b/gr-blocks/lib/and_const_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc index e7f105fc0..04f9a2f45 100644 --- a/gr-blocks/lib/annotator_1to1_impl.cc +++ b/gr-blocks/lib/annotator_1to1_impl.cc @@ -25,7 +25,7 @@ #endif #include "annotator_1to1_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <iostream> #include <iomanip> @@ -41,9 +41,9 @@ namespace gr { } annotator_1to1_impl::annotator_1to1_impl(int when, size_t sizeof_stream_item) - : gr_sync_block("annotator_1to1", - gr_make_io_signature(1, -1, sizeof_stream_item), - gr_make_io_signature(1, -1, sizeof_stream_item)), + : sync_block("annotator_1to1", + io_signature::make(1, -1, sizeof_stream_item), + io_signature::make(1, -1, sizeof_stream_item)), d_itemsize(sizeof_stream_item), d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ONE_TO_ONE); @@ -72,10 +72,10 @@ namespace gr { for(int i = 0; i < ninputs; i++) { abs_N = nitems_read(i); - std::vector<gr_tag_t> all_tags; + std::vector<tag_t> all_tags; get_tags_in_range(all_tags, i, abs_N, abs_N + noutput_items); - std::vector<gr_tag_t>::iterator itr; + std::vector<tag_t>::iterator itr; for(itr = all_tags.begin(); itr != all_tags.end(); itr++) { d_stored_tags.push_back(*itr); } diff --git a/gr-blocks/lib/annotator_1to1_impl.h b/gr-blocks/lib/annotator_1to1_impl.h index 3306602e2..2da73c8a6 100644 --- a/gr-blocks/lib/annotator_1to1_impl.h +++ b/gr-blocks/lib/annotator_1to1_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_ANNOTATOR_1TO1_IMPL_H #define INCLUDED_GR_ANNOTATOR_1TO1_IMPL_H -#include <blocks/annotator_1to1.h> +#include <gnuradio/blocks/annotator_1to1.h> namespace gr { namespace blocks { @@ -34,13 +34,13 @@ namespace gr { size_t d_itemsize; uint64_t d_when; uint64_t d_tag_counter; - std::vector<gr_tag_t> d_stored_tags; + std::vector<tag_t> d_stored_tags; public: annotator_1to1_impl(int when, size_t sizeof_stream_item); ~annotator_1to1_impl(); - std::vector<gr_tag_t> data() const + std::vector<tag_t> data() const { return d_stored_tags; } diff --git a/gr-blocks/lib/annotator_alltoall_impl.cc b/gr-blocks/lib/annotator_alltoall_impl.cc index 4909f7f82..cedf8dd44 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.cc +++ b/gr-blocks/lib/annotator_alltoall_impl.cc @@ -25,7 +25,7 @@ #endif #include "annotator_alltoall_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <iostream> #include <iomanip> @@ -42,9 +42,9 @@ namespace gr { annotator_alltoall_impl::annotator_alltoall_impl(int when, size_t sizeof_stream_item) - : gr_sync_block("annotator_alltoall", - gr_make_io_signature(1, -1, sizeof_stream_item), - gr_make_io_signature(1, -1, sizeof_stream_item)), + : sync_block("annotator_alltoall", + io_signature::make(1, -1, sizeof_stream_item), + io_signature::make(1, -1, sizeof_stream_item)), d_itemsize(sizeof_stream_item), d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ALL_TO_ALL); @@ -73,10 +73,10 @@ namespace gr { abs_N = nitems_read(i); end_N = abs_N + (uint64_t)(noutput_items); - std::vector<gr_tag_t> all_tags; + std::vector<tag_t> all_tags; get_tags_in_range(all_tags, i, abs_N, end_N); - std::vector<gr_tag_t>::iterator itr; + std::vector<tag_t>::iterator itr; for(itr = all_tags.begin(); itr != all_tags.end(); itr++) { d_stored_tags.push_back(*itr); } diff --git a/gr-blocks/lib/annotator_alltoall_impl.h b/gr-blocks/lib/annotator_alltoall_impl.h index 24c21948b..81b73a897 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.h +++ b/gr-blocks/lib/annotator_alltoall_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_IMPL_H #define INCLUDED_GR_ANNOTATOR_ALLTOALL_IMPL_H -#include <blocks/annotator_alltoall.h> +#include <gnuradio/blocks/annotator_alltoall.h> namespace gr { namespace blocks { @@ -34,13 +34,13 @@ namespace gr { size_t d_itemsize; uint64_t d_when; uint64_t d_tag_counter; - std::vector<gr_tag_t> d_stored_tags; + std::vector<tag_t> d_stored_tags; public: annotator_alltoall_impl(int when, size_t sizeof_stream_item); ~annotator_alltoall_impl(); - std::vector<gr_tag_t> data() const + std::vector<tag_t> data() const { return d_stored_tags; } diff --git a/gr-blocks/lib/annotator_raw_impl.cc b/gr-blocks/lib/annotator_raw_impl.cc index ee5deb1f6..499168c27 100644 --- a/gr-blocks/lib/annotator_raw_impl.cc +++ b/gr-blocks/lib/annotator_raw_impl.cc @@ -25,7 +25,7 @@ #endif #include "annotator_raw_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <iostream> #include <iomanip> @@ -44,9 +44,9 @@ namespace gr { } annotator_raw_impl::annotator_raw_impl(size_t sizeof_stream_item) - : gr_sync_block("annotator_raw", - gr_make_io_signature(1, 1, sizeof_stream_item), - gr_make_io_signature(1, 1, sizeof_stream_item)), + : sync_block("annotator_raw", + io_signature::make(1, 1, sizeof_stream_item), + io_signature::make(1, 1, sizeof_stream_item)), d_itemsize(sizeof_stream_item) { set_tag_propagation_policy(TPP_ONE_TO_ONE); @@ -62,7 +62,7 @@ namespace gr { { gr::thread::scoped_lock l(d_mutex); - gr_tag_t tag; + tag_t tag; tag.srcid = pmt::intern(name()); tag.key = key; tag.value = val; @@ -72,7 +72,7 @@ namespace gr { d_queued_tags.push_back(tag); // make sure our tags are in offset order std::sort(d_queued_tags.begin(), d_queued_tags.end(), - gr_tag_t::offset_compare); + tag_t::offset_compare); // make sure we are not adding an item in the past! if(tag.offset > nitems_read(0)) { throw std::runtime_error("annotator_raw::add_tag: item added too far in the past\n."); @@ -93,7 +93,7 @@ namespace gr { uint64_t end_N = start_N + (uint64_t)(noutput_items); // locate queued tags that fall in this range and insert them when appropriate - std::vector<gr_tag_t>::iterator i = d_queued_tags.begin(); + std::vector<tag_t>::iterator i = d_queued_tags.begin(); while( i != d_queued_tags.end() ) { if( (*i).offset >= start_N && (*i).offset < end_N) { add_item_tag(0, (*i).offset,(*i).key, (*i).value, (*i).srcid); diff --git a/gr-blocks/lib/annotator_raw_impl.h b/gr-blocks/lib/annotator_raw_impl.h index e0e16c30d..54bed2ea2 100644 --- a/gr-blocks/lib/annotator_raw_impl.h +++ b/gr-blocks/lib/annotator_raw_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_ANNOTATOR_RAW_IMPL_H #define INCLUDED_GR_ANNOTATOR_RAW_IMPL_H -#include <blocks/annotator_raw.h> -#include <thread/thread.h> +#include <gnuradio/blocks/annotator_raw.h> +#include <gnuradio/thread/thread.h> namespace gr { namespace blocks { @@ -33,7 +33,7 @@ namespace gr { { private: size_t d_itemsize; - std::vector<gr_tag_t> d_queued_tags; + std::vector<tag_t> d_queued_tags; gr::thread::mutex d_mutex; public: diff --git a/gr-blocks/lib/argmax_XX_impl.cc.t b/gr-blocks/lib/argmax_XX_impl.cc.t index 56673ef99..87e025e2d 100644 --- a/gr-blocks/lib/argmax_XX_impl.cc.t +++ b/gr-blocks/lib/argmax_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, -1, vlen*sizeof(@I_TYPE@)), - gr_make_io_signature(2, 2, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(1, -1, vlen*sizeof(@I_TYPE@)), + io_signature::make(2, 2, sizeof(@O_TYPE@))), d_vlen(vlen) { } diff --git a/gr-blocks/lib/argmax_XX_impl.h.t b/gr-blocks/lib/argmax_XX_impl.h.t index 0f1643f6b..79da4e1d8 100644 --- a/gr-blocks/lib/argmax_XX_impl.h.t +++ b/gr-blocks/lib/argmax_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/bin_statistics_f_impl.cc b/gr-blocks/lib/bin_statistics_f_impl.cc index 014222a63..1f17e8536 100644 --- a/gr-blocks/lib/bin_statistics_f_impl.cc +++ b/gr-blocks/lib/bin_statistics_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "bin_statistics_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -33,8 +33,8 @@ namespace gr { bin_statistics_f::sptr bin_statistics_f::make(unsigned int vlen, - gr_msg_queue_sptr msgq, - gr_feval_dd *tune, + msg_queue::sptr msgq, + feval_dd *tune, size_t tune_delay, size_t dwell_delay) { @@ -44,13 +44,13 @@ namespace gr { } bin_statistics_f_impl::bin_statistics_f_impl(unsigned int vlen, - gr_msg_queue_sptr msgq, - gr_feval_dd *tune, + msg_queue::sptr msgq, + feval_dd *tune, size_t tune_delay, size_t dwell_delay) - : gr_sync_block("bin_statistics_f", - gr_make_io_signature(1, 1, sizeof(float) * vlen), - gr_make_io_signature(0, 0, 0)), + : sync_block("bin_statistics_f", + io_signature::make(1, 1, sizeof(float) * vlen), + io_signature::make(0, 0, 0)), d_vlen(vlen), d_msgq(msgq), d_tune(tune), d_tune_delay(tune_delay), d_dwell_delay(dwell_delay), d_center_freq(0), d_delay(0), @@ -168,7 +168,7 @@ namespace gr { return; // build & send a message - gr_message_sptr msg = gr_make_message(0, center_freq(), vlen(), vlen() * sizeof(float)); + message::sptr msg = message::make(0, center_freq(), vlen(), vlen() * sizeof(float)); memcpy(msg->msg(), &d_max[0], vlen() * sizeof(float)); msgq()->insert_tail(msg); } diff --git a/gr-blocks/lib/bin_statistics_f_impl.h b/gr-blocks/lib/bin_statistics_f_impl.h index 0abb60ed3..1d8da6b34 100644 --- a/gr-blocks/lib/bin_statistics_f_impl.h +++ b/gr-blocks/lib/bin_statistics_f_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_GR_BIN_STATISTICS_F_IMPL_H #define INCLUDED_GR_BIN_STATISTICS_F_IMPL_H -#include <blocks/bin_statistics_f.h> -#include <gr_feval.h> -#include <gr_message.h> -#include <gr_msg_queue.h> +#include <gnuradio/blocks/bin_statistics_f.h> +#include <gnuradio/feval.h> +#include <gnuradio/message.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace blocks { @@ -37,8 +37,8 @@ namespace gr { enum state_t { ST_INIT, ST_TUNE_DELAY, ST_DWELL_DELAY }; size_t d_vlen; - gr_msg_queue_sptr d_msgq; - gr_feval_dd *d_tune; + msg_queue::sptr d_msgq; + feval_dd *d_tune; size_t d_tune_delay; size_t d_dwell_delay; double d_center_freq; @@ -56,7 +56,7 @@ namespace gr { size_t vlen() const { return d_vlen; } double center_freq() const { return d_center_freq; } - gr_msg_queue_sptr msgq() const { return d_msgq; } + msg_queue::sptr msgq() const { return d_msgq; } virtual void reset_stats(); virtual void accrue_stats(const float *input); @@ -64,8 +64,8 @@ namespace gr { public: bin_statistics_f_impl(unsigned int vlen, - gr_msg_queue_sptr msgq, - gr_feval_dd *tune, + msg_queue::sptr msgq, + feval_dd *tune, size_t tune_delay, size_t dwell_delay); ~bin_statistics_f_impl(); diff --git a/gr-blocks/lib/burst_tagger_impl.cc b/gr-blocks/lib/burst_tagger_impl.cc index 31c535290..da69a0ea4 100644 --- a/gr-blocks/lib/burst_tagger_impl.cc +++ b/gr-blocks/lib/burst_tagger_impl.cc @@ -25,7 +25,7 @@ #endif #include "burst_tagger_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } burst_tagger_impl::burst_tagger_impl(size_t itemsize) - : gr_sync_block("burst_tagger", - gr_make_io_signature2(2, 2, itemsize, sizeof(short)), - gr_make_io_signature(1, 1, itemsize)), + : sync_block("burst_tagger", + io_signature::make2(2, 2, itemsize, sizeof(short)), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_state(false) { std::stringstream str; diff --git a/gr-blocks/lib/burst_tagger_impl.h b/gr-blocks/lib/burst_tagger_impl.h index 80bdec12f..65ad58f8b 100644 --- a/gr-blocks/lib/burst_tagger_impl.h +++ b/gr-blocks/lib/burst_tagger_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_BURST_TAGGER_IMPL_H #define INCLUDED_GR_BURST_TAGGER_IMPL_H -#include <blocks/burst_tagger.h> +#include <gnuradio/blocks/burst_tagger.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/char_to_float_impl.cc b/gr-blocks/lib/char_to_float_impl.cc index 22c5d2e25..de6ee5ba5 100644 --- a/gr-blocks/lib/char_to_float_impl.cc +++ b/gr-blocks/lib/char_to_float_impl.cc @@ -25,7 +25,7 @@ #endif #include "char_to_float_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } char_to_float_impl::char_to_float_impl(size_t vlen, float scale) - : gr_sync_block("char_to_float", - gr_make_io_signature (1, -1, sizeof(char)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("char_to_float", + io_signature::make (1, -1, sizeof(char)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen), d_scale(scale) { const int alignment_multiple = diff --git a/gr-blocks/lib/char_to_float_impl.h b/gr-blocks/lib/char_to_float_impl.h index 620d7e737..f5677f86b 100644 --- a/gr-blocks/lib/char_to_float_impl.h +++ b/gr-blocks/lib/char_to_float_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_CHAR_TO_FLOAT_IMPL_H #define INCLUDED_CHAR_TO_FLOAT_IMPL_H -#include <blocks/char_to_float.h> +#include <gnuradio/blocks/char_to_float.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/char_to_short_impl.cc b/gr-blocks/lib/char_to_short_impl.cc index a86a928b5..2b5414d67 100644 --- a/gr-blocks/lib/char_to_short_impl.cc +++ b/gr-blocks/lib/char_to_short_impl.cc @@ -25,7 +25,7 @@ #endif #include "char_to_short_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } char_to_short_impl::char_to_short_impl(size_t vlen) - : gr_sync_block("char_to_short", - gr_make_io_signature (1, -1, sizeof(char)*vlen), - gr_make_io_signature (1, 1, sizeof(short)*vlen)), + : sync_block("char_to_short", + io_signature::make (1, -1, sizeof(char)*vlen), + io_signature::make (1, 1, sizeof(short)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/char_to_short_impl.h b/gr-blocks/lib/char_to_short_impl.h index efd3ab3a8..1009defed 100644 --- a/gr-blocks/lib/char_to_short_impl.h +++ b/gr-blocks/lib/char_to_short_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_CHAR_TO_SHORT_IMPL_H #define INCLUDED_CHAR_TO_SHORT_IMPL_H -#include <blocks/char_to_short.h> +#include <gnuradio/blocks/char_to_short.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.cc b/gr-blocks/lib/check_lfsr_32k_s_impl.cc index 566406759..fac30223f 100644 --- a/gr-blocks/lib/check_lfsr_32k_s_impl.cc +++ b/gr-blocks/lib/check_lfsr_32k_s_impl.cc @@ -25,7 +25,7 @@ #endif #include "check_lfsr_32k_s_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdlib.h> #include <stdio.h> @@ -40,9 +40,9 @@ namespace gr { } check_lfsr_32k_s_impl::check_lfsr_32k_s_impl() - : gr_sync_block("check_lfsr_32k", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(0, 0, 0)), + : sync_block("check_lfsr_32k", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(0, 0, 0)), d_state(SEARCHING), d_history(0), d_ntotal(0), d_nright(0), d_runlength(0), d_index(0) { diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.h b/gr-blocks/lib/check_lfsr_32k_s_impl.h index f6d3c8daa..e060e89af 100644 --- a/gr-blocks/lib/check_lfsr_32k_s_impl.h +++ b/gr-blocks/lib/check_lfsr_32k_s_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_CHECK_LFSR_32K_S_IMPL_H #define INCLUDED_GR_CHECK_LFSR_32K_S_IMPL_H -#include <blocks/check_lfsr_32k_s.h> -#include <blocks/lfsr_32k.h> +#include <gnuradio/blocks/check_lfsr_32k_s.h> +#include <gnuradio/blocks/lfsr_32k.h> namespace gr { namespace blocks { @@ -59,14 +59,14 @@ namespace gr { void right() { - d_history = (d_history << 1) | 0x1; + d_history = (d_history < 1) | 0x1; d_nright++; d_runlength++; } void wrong() { - d_history = (d_history << 1) | 0x0; + d_history = (d_history < 1) | 0x0; d_runlength = 0; } diff --git a/gr-blocks/lib/complex_to_arg_impl.cc b/gr-blocks/lib/complex_to_arg_impl.cc index 87ac9966f..38539c800 100644 --- a/gr-blocks/lib/complex_to_arg_impl.cc +++ b/gr-blocks/lib/complex_to_arg_impl.cc @@ -25,9 +25,9 @@ #endif #include "complex_to_arg_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> -#include <gr_math.h> +#include <gnuradio/math.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } complex_to_arg_impl::complex_to_arg_impl(size_t vlen) - : gr_sync_block("complex_to_arg", - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("complex_to_arg", + io_signature::make (1, 1, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = @@ -60,7 +60,7 @@ namespace gr { // The fast_atan2f is faster than Volk for (int i = 0; i < noi; i++){ // out[i] = std::arg (in[i]); - out[i] = gr_fast_atan2f(in[i]); + out[i] = gr::fast_atan2f(in[i]); } return noutput_items; diff --git a/gr-blocks/lib/complex_to_arg_impl.h b/gr-blocks/lib/complex_to_arg_impl.h index 9ccfba05a..cc1863b2d 100644 --- a/gr-blocks/lib/complex_to_arg_impl.h +++ b/gr-blocks/lib/complex_to_arg_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_ARG_IMPL_H #define INCLUDED_COMPLEX_TO_ARG_IMPL_H -#include <blocks/complex_to_arg.h> +#include <gnuradio/blocks/complex_to_arg.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/complex_to_float_impl.cc b/gr-blocks/lib/complex_to_float_impl.cc index 3c1109de5..d0b2bc6b9 100644 --- a/gr-blocks/lib/complex_to_float_impl.cc +++ b/gr-blocks/lib/complex_to_float_impl.cc @@ -25,7 +25,7 @@ #endif #include "complex_to_float_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } complex_to_float_impl::complex_to_float_impl(size_t vlen) - : gr_sync_block("complex_to_float", - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 2, sizeof(float)*vlen)), + : sync_block("complex_to_float", + io_signature::make (1, 1, sizeof(gr_complex)*vlen), + io_signature::make (1, 2, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/complex_to_float_impl.h b/gr-blocks/lib/complex_to_float_impl.h index d90ac28d5..d4fdcb7a9 100644 --- a/gr-blocks/lib/complex_to_float_impl.h +++ b/gr-blocks/lib/complex_to_float_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_FLOAT_IMPL_H #define INCLUDED_COMPLEX_TO_FLOAT_IMPL_H -#include <blocks/complex_to_float.h> +#include <gnuradio/blocks/complex_to_float.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/complex_to_imag_impl.cc b/gr-blocks/lib/complex_to_imag_impl.cc index 760440cc9..27d349aa1 100644 --- a/gr-blocks/lib/complex_to_imag_impl.cc +++ b/gr-blocks/lib/complex_to_imag_impl.cc @@ -25,7 +25,7 @@ #endif #include "complex_to_imag_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } complex_to_imag_impl::complex_to_imag_impl(size_t vlen) - : gr_sync_block("complex_to_imag", - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("complex_to_imag", + io_signature::make (1, 1, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/complex_to_imag_impl.h b/gr-blocks/lib/complex_to_imag_impl.h index e647e6773..6758b0f6c 100644 --- a/gr-blocks/lib/complex_to_imag_impl.h +++ b/gr-blocks/lib/complex_to_imag_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_IMAG_IMPL_H #define INCLUDED_COMPLEX_TO_IMAG_IMPL_H -#include <blocks/complex_to_imag.h> +#include <gnuradio/blocks/complex_to_imag.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.cc b/gr-blocks/lib/complex_to_interleaved_short_impl.cc index 2f2ea6e00..87146364b 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.cc +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.cc @@ -25,7 +25,7 @@ #endif #include "complex_to_interleaved_short_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } complex_to_interleaved_short_impl::complex_to_interleaved_short_impl() - : gr_sync_interpolator("complex_to_interleaved_short", - gr_make_io_signature (1, 1, sizeof(gr_complex)), - gr_make_io_signature (1, 1, sizeof(short)), + : sync_interpolator("complex_to_interleaved_short", + io_signature::make (1, 1, sizeof(gr_complex)), + io_signature::make (1, 1, sizeof(short)), 2) { } diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.h b/gr-blocks/lib/complex_to_interleaved_short_impl.h index 9a09d1ff9..7bcea95be 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.h +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_INTERLEAVED_SHORT_IMPL_H #define INCLUDED_COMPLEX_TO_INTERLEAVED_SHORT_IMPL_H -#include <blocks/complex_to_interleaved_short.h> +#include <gnuradio/blocks/complex_to_interleaved_short.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/complex_to_mag_impl.cc b/gr-blocks/lib/complex_to_mag_impl.cc index 419bc53eb..52a193f4d 100644 --- a/gr-blocks/lib/complex_to_mag_impl.cc +++ b/gr-blocks/lib/complex_to_mag_impl.cc @@ -25,7 +25,7 @@ #endif #include "complex_to_mag_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } complex_to_mag_impl::complex_to_mag_impl(size_t vlen) - : gr_sync_block("complex_to_mag", - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("complex_to_mag", + io_signature::make (1, 1, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/complex_to_mag_impl.h b/gr-blocks/lib/complex_to_mag_impl.h index fe6da3f15..54f12ac31 100644 --- a/gr-blocks/lib/complex_to_mag_impl.h +++ b/gr-blocks/lib/complex_to_mag_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_MAG_IMPL_H #define INCLUDED_COMPLEX_TO_MAG_IMPL_H -#include <blocks/complex_to_mag.h> +#include <gnuradio/blocks/complex_to_mag.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.cc b/gr-blocks/lib/complex_to_mag_squared_impl.cc index a3b48b153..513527c25 100644 --- a/gr-blocks/lib/complex_to_mag_squared_impl.cc +++ b/gr-blocks/lib/complex_to_mag_squared_impl.cc @@ -25,7 +25,7 @@ #endif #include "complex_to_mag_squared_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } complex_to_mag_squared_impl::complex_to_mag_squared_impl(size_t vlen) - : gr_sync_block("complex_to_mag_squared", - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("complex_to_mag_squared", + io_signature::make (1, 1, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.h b/gr-blocks/lib/complex_to_mag_squared_impl.h index 01851d266..0cf22c8d9 100644 --- a/gr-blocks/lib/complex_to_mag_squared_impl.h +++ b/gr-blocks/lib/complex_to_mag_squared_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_MAG_SQUARED_IMPL_H #define INCLUDED_COMPLEX_TO_MAG_SQUARED_IMPL_H -#include <blocks/complex_to_mag_squared.h> +#include <gnuradio/blocks/complex_to_mag_squared.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/complex_to_real_impl.cc b/gr-blocks/lib/complex_to_real_impl.cc index 6f053b669..06d1b5ab0 100644 --- a/gr-blocks/lib/complex_to_real_impl.cc +++ b/gr-blocks/lib/complex_to_real_impl.cc @@ -25,7 +25,7 @@ #endif #include "complex_to_real_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } complex_to_real_impl::complex_to_real_impl(size_t vlen) - : gr_sync_block("complex_to_real", - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("complex_to_real", + io_signature::make (1, 1, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/complex_to_real_impl.h b/gr-blocks/lib/complex_to_real_impl.h index 7d4d4306f..233f90c93 100644 --- a/gr-blocks/lib/complex_to_real_impl.h +++ b/gr-blocks/lib/complex_to_real_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMPLEX_TO_REAL_IMPL_H #define INCLUDED_COMPLEX_TO_REAL_IMPL_H -#include <blocks/complex_to_real.h> +#include <gnuradio/blocks/complex_to_real.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/conjugate_cc_impl.cc b/gr-blocks/lib/conjugate_cc_impl.cc index 3d46bef68..14fbbf172 100644 --- a/gr-blocks/lib/conjugate_cc_impl.cc +++ b/gr-blocks/lib/conjugate_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "conjugate_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } conjugate_cc_impl::conjugate_cc_impl() - : gr_sync_block("conjugate_cc", - gr_make_io_signature (1, 1, sizeof(gr_complex)), - gr_make_io_signature (1, 1, sizeof(gr_complex))) + : sync_block("conjugate_cc", + io_signature::make (1, 1, sizeof(gr_complex)), + io_signature::make (1, 1, sizeof(gr_complex))) { const int alignment_multiple = volk_get_alignment() / sizeof(gr_complex); diff --git a/gr-blocks/lib/conjugate_cc_impl.h b/gr-blocks/lib/conjugate_cc_impl.h index 448e7b318..d3d0f9a0b 100644 --- a/gr-blocks/lib/conjugate_cc_impl.h +++ b/gr-blocks/lib/conjugate_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_CONJUGATE_CC_IMPL_H #define INCLUDED_CONJUGATE_CC_IMPL_H -#include <blocks/conjugate_cc.h> +#include <gnuradio/blocks/conjugate_cc.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/control_loop.cc b/gr-blocks/lib/control_loop.cc index 44f4e5339..bd33e6a7a 100644 --- a/gr-blocks/lib/control_loop.cc +++ b/gr-blocks/lib/control_loop.cc @@ -24,8 +24,8 @@ #include "config.h" #endif -#include <blocks/control_loop.h> -#include <gr_math.h> +#include <gnuradio/blocks/control_loop.h> +#include <gnuradio/math.h> #include <stdexcept> namespace gr { diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc index 929f22b7d..564ea09ef 100644 --- a/gr-blocks/lib/copy_impl.cc +++ b/gr-blocks/lib/copy_impl.cc @@ -25,7 +25,7 @@ #endif #include "copy_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } copy_impl::copy_impl(size_t itemsize) - : gr_block("copy", - gr_make_io_signature(1, -1, itemsize), - gr_make_io_signature(1, -1, itemsize)), + : block("copy", + io_signature::make(1, -1, itemsize), + io_signature::make(1, -1, itemsize)), d_itemsize(itemsize), d_enabled(true) { diff --git a/gr-blocks/lib/copy_impl.h b/gr-blocks/lib/copy_impl.h index 1f0f1a655..5f3c81a30 100644 --- a/gr-blocks/lib/copy_impl.h +++ b/gr-blocks/lib/copy_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_COPY_IMPL_H #define INCLUDED_GR_COPY_IMPL_H -#include <blocks/copy.h> +#include <gnuradio/blocks/copy.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/count_bits.cc b/gr-blocks/lib/count_bits.cc index 167396b57..c65dc9489 100644 --- a/gr-blocks/lib/count_bits.cc +++ b/gr-blocks/lib/count_bits.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <blocks/count_bits.h> +#include <gnuradio/blocks/count_bits.h> /* * these are slow and obvious. If you need something faster, fix these diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc index f52e605a0..bc6febdb2 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "ctrlport_probe2_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { ctrlport_probe2_c_impl::ctrlport_probe2_c_impl(const std::string &id, const std::string &desc, int len) - : gr_sync_block("probe2_c", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("probe2_c", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_id(id), d_desc(desc), d_len(len) { set_length(len); diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h index 4d290a4e8..c58d97f07 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_CTRLPORT_PROBE2_C_IMPL_H #define INCLUDED_CTRLPORT_PROBE2_C_IMPL_H -#include <blocks/ctrlport_probe2_c.h> -#include <rpcregisterhelpers.h> +#include <gnuradio/blocks/ctrlport_probe2_c.h> +#include <gnuradio/rpcregisterhelpers.h> #include <boost/thread/shared_mutex.hpp> namespace gr { diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.cc b/gr-blocks/lib/ctrlport_probe_c_impl.cc index e11bd0496..1c077af48 100644 --- a/gr-blocks/lib/ctrlport_probe_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "ctrlport_probe_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { ctrlport_probe_c_impl::ctrlport_probe_c_impl(const std::string &id, const std::string &desc) - : gr_sync_block("probe_c", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("probe_c", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_id(id), d_desc(desc), d_ptr(NULL), d_ptrLen(0) { } diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.h b/gr-blocks/lib/ctrlport_probe_c_impl.h index 5d9073ac1..59e9497a8 100644 --- a/gr-blocks/lib/ctrlport_probe_c_impl.h +++ b/gr-blocks/lib/ctrlport_probe_c_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_CTRLPORT_PROBE_C_IMPL_H #define INCLUDED_CTRLPORT_PROBE_C_IMPL_H -#include <blocks/ctrlport_probe_c.h> -#include <rpcregisterhelpers.h> +#include <gnuradio/blocks/ctrlport_probe_c.h> +#include <gnuradio/rpcregisterhelpers.h> #include <boost/thread/shared_mutex.hpp> namespace gr { diff --git a/gr-blocks/lib/deinterleave_impl.cc b/gr-blocks/lib/deinterleave_impl.cc index badf4973a..6866cc7ac 100644 --- a/gr-blocks/lib/deinterleave_impl.cc +++ b/gr-blocks/lib/deinterleave_impl.cc @@ -25,7 +25,7 @@ #endif #include "deinterleave_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } deinterleave_impl::deinterleave_impl(size_t itemsize) - : gr_sync_decimator("deinterleave", - gr_make_io_signature (1, 1, itemsize), - gr_make_io_signature (1, gr_io_signature::IO_INFINITE, itemsize), + : sync_decimator("deinterleave", + io_signature::make (1, 1, itemsize), + io_signature::make (1, io_signature::IO_INFINITE, itemsize), 1), d_itemsize(itemsize) { diff --git a/gr-blocks/lib/deinterleave_impl.h b/gr-blocks/lib/deinterleave_impl.h index 762c9d5fe..d4d9392e8 100644 --- a/gr-blocks/lib/deinterleave_impl.h +++ b/gr-blocks/lib/deinterleave_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_DEINTERLEAVE_IMPL_H #define INCLUDED_DEINTERLEAVE_IMPL_H -#include <blocks/deinterleave.h> +#include <gnuradio/blocks/deinterleave.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/delay_impl.cc b/gr-blocks/lib/delay_impl.cc index 08cd1db1c..197aa6697 100644 --- a/gr-blocks/lib/delay_impl.cc +++ b/gr-blocks/lib/delay_impl.cc @@ -25,7 +25,7 @@ #endif #include "delay_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } delay_impl::delay_impl(size_t itemsize, int delay) - : gr_block("delay", - gr_make_io_signature(1, -1, itemsize), - gr_make_io_signature(1, -1, itemsize)), + : block("delay", + io_signature::make(1, -1, itemsize), + io_signature::make(1, -1, itemsize)), d_itemsize(itemsize) { set_dly(delay); diff --git a/gr-blocks/lib/delay_impl.h b/gr-blocks/lib/delay_impl.h index 1cb959359..ad07e6aa7 100644 --- a/gr-blocks/lib/delay_impl.h +++ b/gr-blocks/lib/delay_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_DELAY_IMPL_H #define INCLUDED_GR_DELAY_IMPL_H -#include <blocks/delay.h> -#include <thread/thread.h> +#include <gnuradio/blocks/delay.h> +#include <gnuradio/thread/thread.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/divide_XX_impl.cc.t b/gr-blocks/lib/divide_XX_impl.cc.t index 223d6ad90..30cb3ab38 100644 --- a/gr-blocks/lib/divide_XX_impl.cc.t +++ b/gr-blocks/lib/divide_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/divide_XX_impl.h.t b/gr-blocks/lib/divide_XX_impl.h.t index a1c486b85..2680ef701 100644 --- a/gr-blocks/lib/divide_XX_impl.h.t +++ b/gr-blocks/lib/divide_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/endian_swap_impl.cc b/gr-blocks/lib/endian_swap_impl.cc index 7e67c3014..3c263e40a 100644 --- a/gr-blocks/lib/endian_swap_impl.cc +++ b/gr-blocks/lib/endian_swap_impl.cc @@ -25,7 +25,7 @@ #endif #include "endian_swap_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } endian_swap_impl::endian_swap_impl (size_t item_size_bytes) - : gr_sync_block("endian_swap_impl", - gr_make_io_signature(1, 1, item_size_bytes), - gr_make_io_signature(1, 1, item_size_bytes)) + : sync_block("endian_swap_impl", + io_signature::make(1, 1, item_size_bytes), + io_signature::make(1, 1, item_size_bytes)) { const int alignment_multiple = volk_get_alignment(); set_alignment(std::max(1, alignment_multiple)); diff --git a/gr-blocks/lib/endian_swap_impl.h b/gr-blocks/lib/endian_swap_impl.h index 517df44f1..ab8fff1b6 100644 --- a/gr-blocks/lib/endian_swap_impl.h +++ b/gr-blocks/lib/endian_swap_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_ENDIAN_SWAP_IMPL_H #define INCLUDED_GR_ENDIAN_SWAP_IMPL_H -#include <blocks/endian_swap.h> +#include <gnuradio/blocks/endian_swap.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/file_descriptor_sink_impl.cc b/gr-blocks/lib/file_descriptor_sink_impl.cc index a1f26220d..975c60c63 100644 --- a/gr-blocks/lib/file_descriptor_sink_impl.cc +++ b/gr-blocks/lib/file_descriptor_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "file_descriptor_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -49,9 +49,9 @@ namespace gr { } file_descriptor_sink_impl::file_descriptor_sink_impl(size_t itemsize, int fd) - : gr_sync_block("file_descriptor_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("file_descriptor_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_fd(fd) { } diff --git a/gr-blocks/lib/file_descriptor_sink_impl.h b/gr-blocks/lib/file_descriptor_sink_impl.h index 90b02f416..0b455879a 100644 --- a/gr-blocks/lib/file_descriptor_sink_impl.h +++ b/gr-blocks/lib/file_descriptor_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_IMPL_H #define INCLUDED_GR_FILE_DESCRIPTOR_SINK_IMPL_H -#include <blocks/file_descriptor_sink.h> +#include <gnuradio/blocks/file_descriptor_sink.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc index 667e96b7f..575681ba9 100644 --- a/gr-blocks/lib/file_descriptor_source_impl.cc +++ b/gr-blocks/lib/file_descriptor_source_impl.cc @@ -25,7 +25,7 @@ #endif #include "file_descriptor_source_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -52,9 +52,9 @@ namespace gr { file_descriptor_source_impl::file_descriptor_source_impl(size_t itemsize, int fd, bool repeat) - : gr_sync_block("file_descriptor_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), + : sync_block("file_descriptor_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_fd(fd), d_repeat(repeat), d_residue(new unsigned char[itemsize]), d_residue_len (0) { diff --git a/gr-blocks/lib/file_descriptor_source_impl.h b/gr-blocks/lib/file_descriptor_source_impl.h index dd86e18af..6bdfa0361 100644 --- a/gr-blocks/lib/file_descriptor_source_impl.h +++ b/gr-blocks/lib/file_descriptor_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_IMPL_H #define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_IMPL_H -#include <blocks/file_descriptor_source.h> +#include <gnuradio/blocks/file_descriptor_source.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc index dc87a7e95..82ecb93db 100644 --- a/gr-blocks/lib/file_meta_sink_impl.cc +++ b/gr-blocks/lib/file_meta_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "file_meta_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <sys/types.h> #include <sys/stat.h> @@ -79,9 +79,9 @@ namespace gr { size_t max_segment_size, const std::string &extra_dict, bool detached_header) - : gr_sync_block("file_meta_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("file_meta_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_samp_rate(samp_rate), d_relative_rate(relative_rate), d_max_seg_size(max_segment_size), d_total_seg_size(0), @@ -396,10 +396,10 @@ namespace gr { uint64_t abs_N = nitems_read(0); uint64_t end_N = abs_N + (uint64_t)(noutput_items); - std::vector<gr_tag_t> all_tags; + std::vector<tag_t> all_tags; get_tags_in_range(all_tags, 0, abs_N, end_N); - std::vector<gr_tag_t>::iterator itr; + std::vector<tag_t>::iterator itr; for(itr = all_tags.begin(); itr != all_tags.end(); itr++) { int item_offset = (int)(itr->offset - abs_N); diff --git a/gr-blocks/lib/file_meta_sink_impl.h b/gr-blocks/lib/file_meta_sink_impl.h index d4048e1e4..e454341f6 100644 --- a/gr-blocks/lib/file_meta_sink_impl.h +++ b/gr-blocks/lib/file_meta_sink_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_BLOCKS_FILE_META_SINK_IMPL_H #define INCLUDED_BLOCKS_FILE_META_SINK_IMPL_H -#include <blocks/file_meta_sink.h> +#include <gnuradio/blocks/file_meta_sink.h> #include <pmt/pmt.h> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> using namespace pmt; diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index 2b16b9066..6f1338dd5 100644 --- a/gr-blocks/lib/file_meta_source_impl.cc +++ b/gr-blocks/lib/file_meta_source_impl.cc @@ -25,7 +25,7 @@ #endif #include "file_meta_source_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <sys/types.h> #include <sys/stat.h> @@ -72,9 +72,9 @@ namespace gr { bool repeat, bool detached_header, const std::string &hdr_filename) - : gr_sync_block("file_meta_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, 1)), + : sync_block("file_meta_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, 1)), d_itemsize(0), d_samp_rate(0), d_seg_size(0), d_updated(false), d_repeat(repeat) @@ -104,7 +104,7 @@ namespace gr { throw std::runtime_error("file_meta_source: could not read header.\n"); // Set output signature based on itemsize info in header - set_output_signature(gr_make_io_signature(1, 1, d_itemsize)); + set_output_signature(io_signature::make(1, 1, d_itemsize)); } file_meta_source_impl::~file_meta_source_impl() @@ -197,7 +197,7 @@ namespace gr { void file_meta_source_impl::parse_header(pmt::pmt_t hdr, uint64_t offset, - std::vector<gr_tag_t> &tags) + std::vector<tag_t> &tags) { pmt::pmt_t r, key; @@ -207,7 +207,7 @@ namespace gr { r = pmt::dict_ref(hdr, key, pmt::PMT_NIL); d_samp_rate = pmt::to_double(r); - gr_tag_t t; + tag_t t; t.offset = offset; t.key = key; t.value = r; @@ -223,7 +223,7 @@ namespace gr { if(pmt::dict_has_key(hdr, key)) { d_time_stamp = pmt::dict_ref(hdr, key, pmt::PMT_NIL); - gr_tag_t t; + tag_t t; t.offset = offset; t.key = key; t.value = d_time_stamp; @@ -256,7 +256,7 @@ namespace gr { void file_meta_source_impl::parse_extras(pmt::pmt_t extras, uint64_t offset, - std::vector<gr_tag_t> &tags) + std::vector<tag_t> &tags) { pmt::pmt_t item, key, val; @@ -266,7 +266,7 @@ namespace gr { key = pmt::car(item); val = pmt::cdr(item); - gr_tag_t t; + tag_t t; t.offset = offset; t.key = key; t.value = val; diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h index 3f8ebda6e..00d8d7e86 100644 --- a/gr-blocks/lib/file_meta_source_impl.h +++ b/gr-blocks/lib/file_meta_source_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_IMPL_H #define INCLUDED_BLOCKS_FILE_META_SOURCE_IMPL_H -#include <blocks/file_meta_source.h> -#include <gr_tags.h> +#include <gnuradio/blocks/file_meta_source.h> +#include <gnuradio/tags.h> #include <pmt/pmt.h> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> -#include <blocks/file_meta_sink.h> +#include <gnuradio/blocks/file_meta_sink.h> using namespace pmt; @@ -55,15 +55,15 @@ namespace gr { FILE *d_fp, *d_hdr_fp; meta_state_t d_state; - std::vector<gr_tag_t> d_tags; + std::vector<tag_t> d_tags; protected: bool _open(FILE **fp, const char *filename); bool read_header(pmt_t &hdr, pmt_t &extras); void parse_header(pmt_t hdr, uint64_t offset, - std::vector<gr_tag_t> &tags); + std::vector<tag_t> &tags); void parse_extras(pmt_t extras, uint64_t offset, - std::vector<gr_tag_t> &tags); + std::vector<tag_t> &tags); public: file_meta_source_impl(const std::string &filename, diff --git a/gr-blocks/lib/file_sink_base.cc b/gr-blocks/lib/file_sink_base.cc index d3a36f332..42e2eae52 100644 --- a/gr-blocks/lib/file_sink_base.cc +++ b/gr-blocks/lib/file_sink_base.cc @@ -24,14 +24,14 @@ #include "config.h" #endif -#include <blocks/file_sink_base.h> +#include <gnuradio/blocks/file_sink_base.h> #include <cstdio> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <stdexcept> #include <stdio.h> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> // win32 (mingw/msvc) specific #ifdef HAVE_IO_H diff --git a/gr-blocks/lib/file_sink_impl.cc b/gr-blocks/lib/file_sink_impl.cc index 88dcb5a02..e78576e28 100644 --- a/gr-blocks/lib/file_sink_impl.cc +++ b/gr-blocks/lib/file_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "file_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } file_sink_impl::file_sink_impl(size_t itemsize, const char *filename) - : gr_sync_block("file_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("file_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), file_sink_base(filename, true), d_itemsize(itemsize) { diff --git a/gr-blocks/lib/file_sink_impl.h b/gr-blocks/lib/file_sink_impl.h index 8e802ad88..f86009419 100644 --- a/gr-blocks/lib/file_sink_impl.h +++ b/gr-blocks/lib/file_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_FILE_SINK_IMPL_H #define INCLUDED_GR_FILE_SINK_IMPL_H -#include <blocks/file_sink.h> +#include <gnuradio/blocks/file_sink.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc index 3c30884a5..d41399554 100644 --- a/gr-blocks/lib/file_source_impl.cc +++ b/gr-blocks/lib/file_source_impl.cc @@ -24,9 +24,9 @@ #include "config.h" #endif -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> #include "file_source_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <sys/types.h> #include <sys/stat.h> @@ -60,9 +60,9 @@ namespace gr { } file_source_impl::file_source_impl(size_t itemsize, const char *filename, bool repeat) - : gr_sync_block("file_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), + : sync_block("file_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_fp(0), d_new_fp(0), d_repeat(repeat), d_updated(false) { diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h index fc7f8053d..5f5e8c934 100644 --- a/gr-blocks/lib/file_source_impl.h +++ b/gr-blocks/lib/file_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_FILE_SOURCE_IMPL_H #define INCLUDED_BLOCKS_FILE_SOURCE_IMPL_H -#include <blocks/file_source.h> +#include <gnuradio/blocks/file_source.h> #include <boost/thread/mutex.hpp> namespace gr { diff --git a/gr-blocks/lib/float_array_to_int.h b/gr-blocks/lib/float_array_to_int.h index 943736d7e..6a528d797 100644 --- a/gr-blocks/lib/float_array_to_int.h +++ b/gr-blocks/lib/float_array_to_int.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H #define INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> /*! * convert array of floats to int with rounding and saturation. diff --git a/gr-blocks/lib/float_array_to_uchar.h b/gr-blocks/lib/float_array_to_uchar.h index defed8e3e..2cc3993d5 100644 --- a/gr-blocks/lib/float_array_to_uchar.h +++ b/gr-blocks/lib/float_array_to_uchar.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FLOAT_ARRAY_TO_UCHAR_H #define INCLUDED_FLOAT_ARRAY_TO_UCHAR_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> /*! * convert array of floats to unsigned chars with rounding and saturation. diff --git a/gr-blocks/lib/float_to_char_impl.cc b/gr-blocks/lib/float_to_char_impl.cc index c37522dc9..cec95cb66 100644 --- a/gr-blocks/lib/float_to_char_impl.cc +++ b/gr-blocks/lib/float_to_char_impl.cc @@ -25,7 +25,7 @@ #endif #include "float_to_char_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } float_to_char_impl::float_to_char_impl(size_t vlen, float scale) - : gr_sync_block("float_to_char", - gr_make_io_signature (1, 1, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(char)*vlen)), + : sync_block("float_to_char", + io_signature::make (1, 1, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(char)*vlen)), d_vlen(vlen), d_scale(scale) { const int alignment_multiple = diff --git a/gr-blocks/lib/float_to_char_impl.h b/gr-blocks/lib/float_to_char_impl.h index 2644f3e70..a5435d996 100644 --- a/gr-blocks/lib/float_to_char_impl.h +++ b/gr-blocks/lib/float_to_char_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FLOAT_TO_CHAR_IMPL_H #define INCLUDED_FLOAT_TO_CHAR_IMPL_H -#include <blocks/float_to_char.h> +#include <gnuradio/blocks/float_to_char.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/float_to_complex_impl.cc b/gr-blocks/lib/float_to_complex_impl.cc index 709aa420c..f37f2bb7a 100644 --- a/gr-blocks/lib/float_to_complex_impl.cc +++ b/gr-blocks/lib/float_to_complex_impl.cc @@ -25,7 +25,7 @@ #endif #include "float_to_complex_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } float_to_complex_impl::float_to_complex_impl(size_t vlen) - : gr_sync_block("float_to_complex", - gr_make_io_signature (1, 2, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen)), + : sync_block("float_to_complex", + io_signature::make (1, 2, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(gr_complex)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/float_to_complex_impl.h b/gr-blocks/lib/float_to_complex_impl.h index 859c5bf96..d28beb269 100644 --- a/gr-blocks/lib/float_to_complex_impl.h +++ b/gr-blocks/lib/float_to_complex_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FLOAT_TO_COMPLEX_IMPL_H #define INCLUDED_FLOAT_TO_COMPLEX_IMPL_H -#include <blocks/float_to_complex.h> +#include <gnuradio/blocks/float_to_complex.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/float_to_int_impl.cc b/gr-blocks/lib/float_to_int_impl.cc index 24218ab68..04db8bed2 100644 --- a/gr-blocks/lib/float_to_int_impl.cc +++ b/gr-blocks/lib/float_to_int_impl.cc @@ -26,7 +26,7 @@ #include "float_to_int_impl.h" #include "float_array_to_int.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -38,9 +38,9 @@ namespace gr { } float_to_int_impl::float_to_int_impl(size_t vlen, float scale) - : gr_sync_block("float_to_int", - gr_make_io_signature (1, 1, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(int)*vlen)), + : sync_block("float_to_int", + io_signature::make (1, 1, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(int)*vlen)), d_vlen(vlen), d_scale(scale) { const int alignment_multiple = diff --git a/gr-blocks/lib/float_to_int_impl.h b/gr-blocks/lib/float_to_int_impl.h index 71775fcb1..d437b50cf 100644 --- a/gr-blocks/lib/float_to_int_impl.h +++ b/gr-blocks/lib/float_to_int_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FLOAT_TO_INT_IMPL_H #define INCLUDED_FLOAT_TO_INT_IMPL_H -#include <blocks/float_to_int.h> +#include <gnuradio/blocks/float_to_int.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/float_to_short_impl.cc b/gr-blocks/lib/float_to_short_impl.cc index 2807ae192..6c6b5607a 100644 --- a/gr-blocks/lib/float_to_short_impl.cc +++ b/gr-blocks/lib/float_to_short_impl.cc @@ -25,7 +25,7 @@ #endif #include "float_to_short_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } float_to_short_impl::float_to_short_impl(size_t vlen, float scale) - : gr_sync_block("float_to_short", - gr_make_io_signature (1, 1, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(short)*vlen)), + : sync_block("float_to_short", + io_signature::make (1, 1, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(short)*vlen)), d_vlen(vlen), d_scale(scale) { const int alignment_multiple = diff --git a/gr-blocks/lib/float_to_short_impl.h b/gr-blocks/lib/float_to_short_impl.h index 5427862b3..2ca5a3bf0 100644 --- a/gr-blocks/lib/float_to_short_impl.h +++ b/gr-blocks/lib/float_to_short_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FLOAT_TO_SHORT_IMPL_H #define INCLUDED_FLOAT_TO_SHORT_IMPL_H -#include <blocks/float_to_short.h> +#include <gnuradio/blocks/float_to_short.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/float_to_uchar_impl.cc b/gr-blocks/lib/float_to_uchar_impl.cc index 22d0527b1..a55b3dbc8 100644 --- a/gr-blocks/lib/float_to_uchar_impl.cc +++ b/gr-blocks/lib/float_to_uchar_impl.cc @@ -26,7 +26,7 @@ #include "float_to_uchar_impl.h" #include "float_array_to_uchar.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -37,9 +37,9 @@ namespace gr { } float_to_uchar_impl::float_to_uchar_impl() - : gr_sync_block("float_to_uchar", - gr_make_io_signature (1, 1, sizeof(float)), - gr_make_io_signature (1, 1, sizeof(unsigned char))) + : sync_block("float_to_uchar", + io_signature::make (1, 1, sizeof(float)), + io_signature::make (1, 1, sizeof(unsigned char))) { } diff --git a/gr-blocks/lib/float_to_uchar_impl.h b/gr-blocks/lib/float_to_uchar_impl.h index effd66c5c..56e815c51 100644 --- a/gr-blocks/lib/float_to_uchar_impl.h +++ b/gr-blocks/lib/float_to_uchar_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FLOAT_TO_UCHAR_IMPL_H #define INCLUDED_FLOAT_TO_UCHAR_IMPL_H -#include <blocks/float_to_uchar.h> +#include <gnuradio/blocks/float_to_uchar.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/head_impl.cc b/gr-blocks/lib/head_impl.cc index 7dfa36607..4c33f9f08 100644 --- a/gr-blocks/lib/head_impl.cc +++ b/gr-blocks/lib/head_impl.cc @@ -25,7 +25,7 @@ #endif #include "head_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } head_impl::head_impl(size_t sizeof_stream_item, uint64_t nitems) - : gr_sync_block("head", - gr_make_io_signature(1, 1, sizeof_stream_item), - gr_make_io_signature(1, 1, sizeof_stream_item)), + : sync_block("head", + io_signature::make(1, 1, sizeof_stream_item), + io_signature::make(1, 1, sizeof_stream_item)), d_nitems(nitems), d_ncopied_items(0) { } diff --git a/gr-blocks/lib/head_impl.h b/gr-blocks/lib/head_impl.h index a56acfbb2..fe2918c40 100644 --- a/gr-blocks/lib/head_impl.h +++ b/gr-blocks/lib/head_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_HEAD_IMPL_H #define INCLUDED_GR_HEAD_IMPL_H -#include <blocks/head.h> +#include <gnuradio/blocks/head.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/int_to_float_impl.cc b/gr-blocks/lib/int_to_float_impl.cc index 0190d7ccb..306a6f169 100644 --- a/gr-blocks/lib/int_to_float_impl.cc +++ b/gr-blocks/lib/int_to_float_impl.cc @@ -25,7 +25,7 @@ #endif #include "int_to_float_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } int_to_float_impl::int_to_float_impl(size_t vlen, float scale) - : gr_sync_block("int_to_float", - gr_make_io_signature (1, 1, sizeof(int32_t)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("int_to_float", + io_signature::make (1, 1, sizeof(int32_t)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen), d_scale(scale) { const int alignment_multiple = diff --git a/gr-blocks/lib/int_to_float_impl.h b/gr-blocks/lib/int_to_float_impl.h index 7498a0bb1..96b416be1 100644 --- a/gr-blocks/lib/int_to_float_impl.h +++ b/gr-blocks/lib/int_to_float_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_INT_TO_FLOAT_IMPL_H #define INCLUDED_INT_TO_FLOAT_IMPL_H -#include <blocks/int_to_float.h> +#include <gnuradio/blocks/int_to_float.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/integrate_XX_impl.cc.t b/gr-blocks/lib/integrate_XX_impl.cc.t index 4c82729e3..2def0309d 100644 --- a/gr-blocks/lib/integrate_XX_impl.cc.t +++ b/gr-blocks/lib/integrate_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(int decim) - : gr_sync_decimator("@NAME@", - gr_make_io_signature(1, 1, sizeof (@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof (@O_TYPE@)), + : sync_decimator("@NAME@", + io_signature::make(1, 1, sizeof (@I_TYPE@)), + io_signature::make(1, 1, sizeof (@O_TYPE@)), decim), d_decim(decim), d_count(0) diff --git a/gr-blocks/lib/integrate_XX_impl.h.t b/gr-blocks/lib/integrate_XX_impl.h.t index 9fc333388..e37ddc077 100644 --- a/gr-blocks/lib/integrate_XX_impl.h.t +++ b/gr-blocks/lib/integrate_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/interleave_impl.cc b/gr-blocks/lib/interleave_impl.cc index df37ed26d..1f68cfc51 100644 --- a/gr-blocks/lib/interleave_impl.cc +++ b/gr-blocks/lib/interleave_impl.cc @@ -25,7 +25,7 @@ #endif #include "interleave_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } interleave_impl::interleave_impl(size_t itemsize) - : gr_sync_interpolator("interleave", - gr_make_io_signature (1, gr_io_signature::IO_INFINITE, itemsize), - gr_make_io_signature (1, 1, itemsize), + : sync_interpolator("interleave", + io_signature::make (1, io_signature::IO_INFINITE, itemsize), + io_signature::make (1, 1, itemsize), 1), d_itemsize(itemsize) { diff --git a/gr-blocks/lib/interleave_impl.h b/gr-blocks/lib/interleave_impl.h index a02517e3e..962747c8b 100644 --- a/gr-blocks/lib/interleave_impl.h +++ b/gr-blocks/lib/interleave_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_INTERLEAVE_IMPL_H #define INCLUDED_INTERLEAVE_IMPL_H -#include <blocks/interleave.h> +#include <gnuradio/blocks/interleave.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/interleaved_short_array_to_complex.h b/gr-blocks/lib/interleaved_short_array_to_complex.h index 3f20fdb98..33f70ccdf 100644 --- a/gr-blocks/lib/interleaved_short_array_to_complex.h +++ b/gr-blocks/lib/interleaved_short_array_to_complex.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_INTERLEAVED_SHORT_ARRAY_TO_COMPLEX_H #define INCLUDED_INTERLEAVED_SHORT_ARRAY_TO_COMPLEX_H -#include <blocks/api.h> -#include <gr_complex.h> +#include <gnuradio/blocks/api.h> +#include <gnuradio/gr_complex.h> /* * convert array of interleaved shorts to complex. diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc index 9a28d9c97..962b29b37 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc @@ -26,7 +26,7 @@ #include "interleaved_short_to_complex_impl.h" #include "interleaved_short_array_to_complex.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -37,10 +37,10 @@ namespace gr { } interleaved_short_to_complex_impl::interleaved_short_to_complex_impl(bool vector_input) - : gr_sync_decimator("interleaved_short_to_complex", - gr_make_io_signature (1, 1, (vector_input?2:1)*sizeof(short)), - gr_make_io_signature (1, 1, sizeof(gr_complex)), - vector_input?1:2), + : sync_decimator("interleaved_short_to_complex", + gr::io_signature::make (1, 1, (vector_input?2:1)*sizeof(short)), + gr::io_signature::make (1, 1, sizeof(gr_complex)), + vector_input?1:2), d_vector_input(vector_input) { } diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.h b/gr-blocks/lib/interleaved_short_to_complex_impl.h index 4d027b7b5..3280f894f 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_INTERLEAVED_SHORT_TO_COMPLEX_IMPL_H #define INCLUDED_INTERLEAVED_SHORT_TO_COMPLEX_IMPL_H -#include <blocks/interleaved_short_to_complex.h> +#include <gnuradio/blocks/interleaved_short_to_complex.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/keep_m_in_n_impl.cc b/gr-blocks/lib/keep_m_in_n_impl.cc index 312b09c25..8ce7a81d8 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.cc +++ b/gr-blocks/lib/keep_m_in_n_impl.cc @@ -25,7 +25,7 @@ #endif #include "keep_m_in_n_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } keep_m_in_n_impl::keep_m_in_n_impl(size_t itemsize, int m, int n, int offset) - : gr_block("keep_m_in_n", - gr_make_io_signature (1, 1, itemsize), - gr_make_io_signature (1, 1, itemsize)), + : block("keep_m_in_n", + io_signature::make (1, 1, itemsize), + io_signature::make (1, 1, itemsize)), d_m(m), d_n(n), d_offset(offset), diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h index 0b8819489..ffb580bb3 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.h +++ b/gr-blocks/lib/keep_m_in_n_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_KEEP_M_IN_N_IMPL_H #define INCLUDED_KEEP_M_IN_N_IMPL_H -#include <blocks/keep_m_in_n.h> +#include <gnuradio/blocks/keep_m_in_n.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/keep_one_in_n_impl.cc b/gr-blocks/lib/keep_one_in_n_impl.cc index 7ab6dc14d..34012dd59 100644 --- a/gr-blocks/lib/keep_one_in_n_impl.cc +++ b/gr-blocks/lib/keep_one_in_n_impl.cc @@ -25,7 +25,7 @@ #endif #include "keep_one_in_n_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } keep_one_in_n_impl::keep_one_in_n_impl(size_t itemsize, int n) - : gr_block("keep_one_in_n", - gr_make_io_signature (1, 1, itemsize), - gr_make_io_signature (1, 1, itemsize)), + : block("keep_one_in_n", + io_signature::make (1, 1, itemsize), + io_signature::make (1, 1, itemsize)), d_count(n) { // To avoid bad behavior with using set_relative_rate in this block with @@ -92,11 +92,11 @@ namespace gr { // Because we have set TPP_DONT, we have to propagate the tags here manually. // Adjustment of the tag sample value is done using the float d_decim_rate. - std::vector<gr_tag_t> tags; - std::vector<gr_tag_t>::iterator t; + std::vector<tag_t> tags; + std::vector<tag_t>::iterator t; get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+ni); for(t = tags.begin(); t != tags.end(); t++) { - gr_tag_t new_tag = *t; + tag_t new_tag = *t; new_tag.offset *= d_decim_rate; add_item_tag(0, new_tag); } diff --git a/gr-blocks/lib/keep_one_in_n_impl.h b/gr-blocks/lib/keep_one_in_n_impl.h index 1588fb1a6..4138f164a 100644 --- a/gr-blocks/lib/keep_one_in_n_impl.h +++ b/gr-blocks/lib/keep_one_in_n_impl.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_KEEP_ONE_IN_N_IMPL_H #define INCLUDED_KEEP_ONE_IN_N_IMPL_H -#include <blocks/keep_one_in_n.h> +#include <gnuradio/blocks/keep_one_in_n.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.cc b/gr-blocks/lib/lfsr_32k_source_s_impl.cc index 738e732b4..58b0ad7de 100644 --- a/gr-blocks/lib/lfsr_32k_source_s_impl.cc +++ b/gr-blocks/lib/lfsr_32k_source_s_impl.cc @@ -25,7 +25,7 @@ #endif #include "lfsr_32k_source_s_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } lfsr_32k_source_s_impl::lfsr_32k_source_s_impl() - : gr_sync_block("lfsr_32k_source_s", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(short))), + : sync_block("lfsr_32k_source_s", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(short))), d_index(0) { lfsr_32k lfsr; diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.h b/gr-blocks/lib/lfsr_32k_source_s_impl.h index b8c684e8d..40fc6b6d8 100644 --- a/gr-blocks/lib/lfsr_32k_source_s_impl.h +++ b/gr-blocks/lib/lfsr_32k_source_s_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_IMPL_H #define INCLUDED_GR_LFSR_32K_SOURCE_S_IMPL_H -#include <blocks/lfsr_32k_source_s.h> -#include <blocks/lfsr_32k.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/lfsr_32k_source_s.h> +#include <gnuradio/blocks/lfsr_32k.h> +#include <gnuradio/sync_block.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/max_XX_impl.cc.t b/gr-blocks/lib/max_XX_impl.cc.t index 669e2fd30..21ce85e8e 100644 --- a/gr-blocks/lib/max_XX_impl.cc.t +++ b/gr-blocks/lib/max_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, -1, vlen*sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(1, -1, vlen*sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_vlen(vlen) { } diff --git a/gr-blocks/lib/max_XX_impl.h.t b/gr-blocks/lib/max_XX_impl.h.t index 0f1643f6b..79da4e1d8 100644 --- a/gr-blocks/lib/max_XX_impl.h.t +++ b/gr-blocks/lib/max_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/message_burst_source_impl.cc b/gr-blocks/lib/message_burst_source_impl.cc index 5ac417f7a..573959e02 100644 --- a/gr-blocks/lib/message_burst_source_impl.cc +++ b/gr-blocks/lib/message_burst_source_impl.cc @@ -25,7 +25,7 @@ #endif #include "message_burst_source_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -33,7 +33,7 @@ #include <fcntl.h> #include <stdexcept> #include <string.h> -#include <gr_tags.h> +#include <gnuradio/tags.h> namespace gr { namespace blocks { @@ -46,17 +46,17 @@ namespace gr { } message_burst_source::sptr - message_burst_source::make(size_t itemsize, gr_msg_queue_sptr msgq) + message_burst_source::make(size_t itemsize, msg_queue::sptr msgq) { return gnuradio::get_initial_sptr (new message_burst_source_impl(itemsize, msgq)); } message_burst_source_impl::message_burst_source_impl(size_t itemsize, int msgq_limit) - : gr_sync_block("message_burst_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), - d_itemsize(itemsize), d_msgq(gr_make_msg_queue(msgq_limit)), + : sync_block("message_burst_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), + d_itemsize(itemsize), d_msgq(msg_queue::make(msgq_limit)), d_msg_offset(0), d_eof(false) { std::stringstream id; @@ -64,10 +64,10 @@ namespace gr { d_me = pmt::string_to_symbol(id.str()); } - message_burst_source_impl::message_burst_source_impl(size_t itemsize, gr_msg_queue_sptr msgq) - : gr_sync_block("message_burst_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), + message_burst_source_impl::message_burst_source_impl(size_t itemsize, msg_queue::sptr msgq) + : sync_block("message_burst_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_msgq(msgq), d_msg_offset(0), d_eof(false) { diff --git a/gr-blocks/lib/message_burst_source_impl.h b/gr-blocks/lib/message_burst_source_impl.h index 2d5e6a974..ceb0985e6 100644 --- a/gr-blocks/lib/message_burst_source_impl.h +++ b/gr-blocks/lib/message_burst_source_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MESSAGE_BURST_SOURCE_IMPL_H #define INCLUDED_GR_MESSAGE_BURST_SOURCE_IMPL_H -#include <blocks/message_burst_source.h> -#include <gr_message.h> +#include <gnuradio/blocks/message_burst_source.h> +#include <gnuradio/message.h> namespace gr { namespace blocks { @@ -33,8 +33,8 @@ namespace gr { { private: size_t d_itemsize; - gr_msg_queue_sptr d_msgq; - gr_message_sptr d_msg; + msg_queue::sptr d_msgq; + message::sptr d_msg; unsigned d_msg_offset; bool d_eof; @@ -42,10 +42,10 @@ namespace gr { public: message_burst_source_impl(size_t itemsize, int msgq_limit); - message_burst_source_impl(size_t itemsize, gr_msg_queue_sptr msgq); + message_burst_source_impl(size_t itemsize, msg_queue::sptr msgq); ~message_burst_source_impl(); - gr_msg_queue_sptr msgq() const { return d_msgq; } + msg_queue::sptr msgq() const { return d_msgq; } int work(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc index 04f31f88a..3f7c6ef09 100644 --- a/gr-blocks/lib/message_debug_impl.cc +++ b/gr-blocks/lib/message_debug_impl.cc @@ -25,7 +25,7 @@ #endif #include "message_debug_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <iostream> @@ -97,9 +97,9 @@ namespace gr { } message_debug_impl::message_debug_impl() - : gr_block("message_debug", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)) + : block("message_debug", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)) { message_port_register_in(pmt::mp("print")); set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); diff --git a/gr-blocks/lib/message_debug_impl.h b/gr-blocks/lib/message_debug_impl.h index 817a9a834..5a6e2e4ac 100644 --- a/gr-blocks/lib/message_debug_impl.h +++ b/gr-blocks/lib/message_debug_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_MESSAGE_DEBUG_IMPL_H #define INCLUDED_GR_MESSAGE_DEBUG_IMPL_H -#include <blocks/message_debug.h> -#include <gr_block.h> -#include <thread/thread.h> +#include <gnuradio/blocks/message_debug.h> +#include <gnuradio/block.h> +#include <gnuradio/thread/thread.h> #include <pmt/pmt.h> namespace gr { diff --git a/gr-blocks/lib/message_sink_impl.cc b/gr-blocks/lib/message_sink_impl.cc index fbc7b27d5..4dfcc6396 100644 --- a/gr-blocks/lib/message_sink_impl.cc +++ b/gr-blocks/lib/message_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "message_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -38,34 +38,34 @@ namespace gr { namespace blocks { message_sink::sptr - message_sink::make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block) + message_sink::make(size_t itemsize, msg_queue::sptr msgq, bool dont_block) { return gnuradio::get_initial_sptr (new message_sink_impl(itemsize, msgq, dont_block)); } message_sink::sptr - message_sink::make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block, + message_sink::make(size_t itemsize, msg_queue::sptr msgq, bool dont_block, const std::string& lengthtagname) { return gnuradio::get_initial_sptr (new message_sink_impl(itemsize, msgq, dont_block, lengthtagname)); } - message_sink_impl::message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block) - : gr_sync_block("message_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + message_sink_impl::message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block) + : sync_block("message_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_msgq(msgq), d_dont_block(dont_block), d_tags(false), d_items_read(0) { } - message_sink_impl::message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block, + message_sink_impl::message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block, const std::string& lengthtagname) - : gr_sync_block("message_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("message_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_msgq(msgq), d_dont_block(dont_block), d_tags(true), d_lengthtagname(lengthtagname), d_items_read(0) { @@ -84,7 +84,7 @@ namespace gr { if (d_tags) { long packet_length = 0; - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; this->get_tags_in_range(tags, 0, d_items_read, d_items_read+1); //const size_t ninput_items = noutput_items; //assumption for sync block, this can change for (unsigned int i = 0; i < tags.size(); i++) { @@ -98,10 +98,10 @@ namespace gr { if (noutput_items >= packet_length ) { // If the message queue is full we drop the packet. if (!d_msgq->full_p()) { - gr_message_sptr msg = gr_make_message(0, // msg type - d_itemsize, // arg1 for other end - packet_length, // arg2 for other end (redundant) - packet_length * d_itemsize); // len of msg + message::sptr msg = message::make(0, // msg type + d_itemsize, // arg1 for other end + packet_length, // arg2 for other end (redundant) + packet_length * d_itemsize); // len of msg memcpy(msg->msg(), in, packet_length * d_itemsize); d_msgq->handle(msg); // send it } @@ -114,10 +114,10 @@ namespace gr { // If the queue if full we drop all the data we got. if (!d_msgq->full_p()) { // build a message to hold whatever we've got - gr_message_sptr msg = gr_make_message(0, // msg type - d_itemsize, // arg1 for other end - noutput_items, // arg2 for other end (redundant) - noutput_items * d_itemsize); // len of msg + message::sptr msg = message::make(0, // msg type + d_itemsize, // arg1 for other end + noutput_items, // arg2 for other end (redundant) + noutput_items * d_itemsize); // len of msg memcpy(msg->msg(), in, noutput_items * d_itemsize); d_msgq->handle(msg); // send it diff --git a/gr-blocks/lib/message_sink_impl.h b/gr-blocks/lib/message_sink_impl.h index 280a46765..e0ae3d00c 100644 --- a/gr-blocks/lib/message_sink_impl.h +++ b/gr-blocks/lib/message_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_MESSAGE_SINK_IMPL_H #define INCLUDED_GR_MESSAGE_SINK_IMPL_H -#include <blocks/message_sink.h> +#include <gnuradio/blocks/message_sink.h> namespace gr { namespace blocks { @@ -32,15 +32,15 @@ namespace gr { { private: size_t d_itemsize; - gr_msg_queue_sptr d_msgq; + msg_queue::sptr d_msgq; bool d_dont_block; bool d_tags; std::string d_lengthtagname; uint64_t d_items_read; public: - message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block); - message_sink_impl(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block, + message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block); + message_sink_impl(size_t itemsize, msg_queue::sptr msgq, bool dont_block, const std::string& lengthtagname); ~message_sink_impl(); diff --git a/gr-blocks/lib/message_source_impl.cc b/gr-blocks/lib/message_source_impl.cc index 818cd336f..05ec2f248 100644 --- a/gr-blocks/lib/message_source_impl.cc +++ b/gr-blocks/lib/message_source_impl.cc @@ -25,7 +25,7 @@ #endif #include "message_source_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -45,14 +45,14 @@ namespace gr { } message_source::sptr - message_source::make(size_t itemsize, gr_msg_queue_sptr msgq) + message_source::make(size_t itemsize, msg_queue::sptr msgq) { return gnuradio::get_initial_sptr (new message_source_impl(itemsize, msgq)); } message_source::sptr - message_source::make(size_t itemsize, gr_msg_queue_sptr msgq, + message_source::make(size_t itemsize, msg_queue::sptr msgq, const std::string& lengthtagname) { return gnuradio::get_initial_sptr @@ -60,28 +60,28 @@ namespace gr { } message_source_impl::message_source_impl(size_t itemsize, int msgq_limit) - : gr_sync_block("message_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), - d_itemsize(itemsize), d_msgq(gr_make_msg_queue(msgq_limit)), + : sync_block("message_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), + d_itemsize(itemsize), d_msgq(msg_queue::make(msgq_limit)), d_msg_offset(0), d_eof(false), d_tags(false) { } - message_source_impl::message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq) - : gr_sync_block("message_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), + message_source_impl::message_source_impl(size_t itemsize, msg_queue::sptr msgq) + : sync_block("message_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_msgq(msgq), d_msg_offset(0), d_eof(false), d_tags(false) { } - message_source_impl::message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq, + message_source_impl::message_source_impl(size_t itemsize, msg_queue::sptr msgq, const std::string& lengthtagname) - : gr_sync_block("message_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), + : sync_block("message_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_msgq(msgq), d_msg_offset(0), d_eof(false), d_tags(true), d_lengthtagname(lengthtagname) { diff --git a/gr-blocks/lib/message_source_impl.h b/gr-blocks/lib/message_source_impl.h index 8fbd209e0..bbc8f728d 100644 --- a/gr-blocks/lib/message_source_impl.h +++ b/gr-blocks/lib/message_source_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_MESSAGE_SOURCE_IMPL_H #define INCLUDED_GR_MESSAGE_SOURCE_IMPL_H -#include <blocks/message_source.h> -#include <gr_message.h> +#include <gnuradio/blocks/message_source.h> +#include <gnuradio/message.h> namespace gr { namespace blocks { @@ -33,8 +33,8 @@ namespace gr { { private: size_t d_itemsize; - gr_msg_queue_sptr d_msgq; - gr_message_sptr d_msg; + msg_queue::sptr d_msgq; + message::sptr d_msg; unsigned d_msg_offset; bool d_eof; bool d_tags; @@ -43,13 +43,13 @@ namespace gr { public: message_source_impl(size_t itemsize, int msgq_limit); - message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq); - message_source_impl(size_t itemsize, gr_msg_queue_sptr msgq, + message_source_impl(size_t itemsize, msg_queue::sptr msgq); + message_source_impl(size_t itemsize, msg_queue::sptr msgq, const std::string& lengthtagname); ~message_source_impl(); - gr_msg_queue_sptr msgq() const { return d_msgq; } + msg_queue::sptr msgq() const { return d_msgq; } int work(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index c4b0e5d56..3f58fdcaa 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -25,7 +25,7 @@ #endif #include "message_strobe_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> @@ -46,9 +46,9 @@ namespace gr { } message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, float period_ms) - : gr_block("message_strobe", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : block("message_strobe", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_finished(false), d_period_ms(period_ms), d_msg(msg) diff --git a/gr-blocks/lib/message_strobe_impl.h b/gr-blocks/lib/message_strobe_impl.h index 1b2edae59..7a5468028 100644 --- a/gr-blocks/lib/message_strobe_impl.h +++ b/gr-blocks/lib/message_strobe_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_MESSAGE_STROBE_IMPL_H #define INCLUDED_GR_MESSAGE_STROBE_IMPL_H -#include <blocks/message_strobe.h> +#include <gnuradio/blocks/message_strobe.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/moving_average_XX_impl.cc.t b/gr-blocks/lib/moving_average_XX_impl.cc.t index 566deff11..089166971 100644 --- a/gr-blocks/lib/moving_average_XX_impl.cc.t +++ b/gr-blocks/lib/moving_average_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME_IMPL@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(int length, @O_TYPE@ scale, int max_iter) - : gr_sync_block("@NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : sync_block("@NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_length(length), d_scale(scale), d_max_iter(max_iter), diff --git a/gr-blocks/lib/moving_average_XX_impl.h.t b/gr-blocks/lib/moving_average_XX_impl.h.t index 7234cbe13..17e8ef5da 100644 --- a/gr-blocks/lib/moving_average_XX_impl.h.t +++ b/gr-blocks/lib/moving_average_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_XX_impl.cc.t b/gr-blocks/lib/multiply_XX_impl.cc.t index bda4eac6a..3f82a1bbe 100644 --- a/gr-blocks/lib/multiply_XX_impl.cc.t +++ b/gr-blocks/lib/multiply_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/multiply_XX_impl.h.t b/gr-blocks/lib/multiply_XX_impl.h.t index 78c62b5e1..2b0ea25a1 100644 --- a/gr-blocks/lib/multiply_XX_impl.h.t +++ b/gr-blocks/lib/multiply_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_cc_impl.cc b/gr-blocks/lib/multiply_cc_impl.cc index e5160a9d5..b54296c11 100644 --- a/gr-blocks/lib/multiply_cc_impl.cc +++ b/gr-blocks/lib/multiply_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include <multiply_cc_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } multiply_cc_impl::multiply_cc_impl(size_t vlen) - : gr_sync_block("multiply_cc", - gr_make_io_signature (1, -1, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen)), + : sync_block("multiply_cc", + io_signature::make (1, -1, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(gr_complex)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/multiply_cc_impl.h b/gr-blocks/lib/multiply_cc_impl.h index 1595dc524..0419a5439 100644 --- a/gr-blocks/lib/multiply_cc_impl.h +++ b/gr-blocks/lib/multiply_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_MULTIPLY_CC_IMPL_H #define INCLUDED_BLOCKS_MULTIPLY_CC_IMPL_H -#include <blocks/multiply_cc.h> +#include <gnuradio/blocks/multiply_cc.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.cc b/gr-blocks/lib/multiply_conjugate_cc_impl.cc index 7a4356c45..671e1160f 100644 --- a/gr-blocks/lib/multiply_conjugate_cc_impl.cc +++ b/gr-blocks/lib/multiply_conjugate_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include <multiply_conjugate_cc_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } multiply_conjugate_cc_impl::multiply_conjugate_cc_impl(size_t vlen) - : gr_sync_block("multiply_conjugate_cc", - gr_make_io_signature (2, 2, sizeof(gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen)), + : sync_block("multiply_conjugate_cc", + io_signature::make (2, 2, sizeof(gr_complex)*vlen), + io_signature::make (1, 1, sizeof(gr_complex)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.h b/gr-blocks/lib/multiply_conjugate_cc_impl.h index 66e7ec55b..f3d3b64d6 100644 --- a/gr-blocks/lib/multiply_conjugate_cc_impl.h +++ b/gr-blocks/lib/multiply_conjugate_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_IMPL_H #define INCLUDED_BLOCKS_MULTIPLY_CONJUGATE_CC_IMPL_H -#include <blocks/multiply_conjugate_cc.h> +#include <gnuradio/blocks/multiply_conjugate_cc.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_const_XX_impl.cc.t b/gr-blocks/lib/multiply_const_XX_impl.cc.t index 8ca79f6f3..f58dd3394 100644 --- a/gr-blocks/lib/multiply_const_XX_impl.cc.t +++ b/gr-blocks/lib/multiply_const_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@))), + : sync_block ("@NAME@", + io_signature::make (1, 1, sizeof (@I_TYPE@)), + io_signature::make (1, 1, sizeof (@O_TYPE@))), d_k(k) { } diff --git a/gr-blocks/lib/multiply_const_XX_impl.h.t b/gr-blocks/lib/multiply_const_XX_impl.h.t index cae5ca813..e0c2ae54b 100644 --- a/gr-blocks/lib/multiply_const_XX_impl.h.t +++ b/gr-blocks/lib/multiply_const_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_const_cc_impl.cc b/gr-blocks/lib/multiply_const_cc_impl.cc index 7618150da..1f363fd4a 100644 --- a/gr-blocks/lib/multiply_const_cc_impl.cc +++ b/gr-blocks/lib/multiply_const_cc_impl.cc @@ -27,7 +27,7 @@ #endif #include <multiply_const_cc_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } multiply_const_cc_impl::multiply_const_cc_impl(gr_complex k, size_t vlen) - : gr_sync_block ("multiply_const_cc", - gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen)), + : sync_block ("multiply_const_cc", + io_signature::make (1, 1, sizeof (gr_complex)*vlen), + io_signature::make (1, 1, sizeof (gr_complex)*vlen)), d_k(k), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/multiply_const_cc_impl.h b/gr-blocks/lib/multiply_const_cc_impl.h index 81c8cc6da..bdd7017c8 100644 --- a/gr-blocks/lib/multiply_const_cc_impl.h +++ b/gr-blocks/lib/multiply_const_cc_impl.h @@ -25,7 +25,7 @@ #ifndef INCLUDED_MULTIPLY_CONST_CC_IMPL_H #define INCLUDED_MULTIPLY_CONST_CC_IMPL_H -#include <blocks/multiply_const_cc.h> +#include <gnuradio/blocks/multiply_const_cc.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_const_ff_impl.cc b/gr-blocks/lib/multiply_const_ff_impl.cc index e9cd34797..67205c06c 100644 --- a/gr-blocks/lib/multiply_const_ff_impl.cc +++ b/gr-blocks/lib/multiply_const_ff_impl.cc @@ -27,7 +27,7 @@ #endif #include <multiply_const_ff_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } multiply_const_ff_impl::multiply_const_ff_impl(float k, size_t vlen) - : gr_sync_block ("multiply_const_ff", - gr_make_io_signature (1, 1, sizeof (float)*vlen), - gr_make_io_signature (1, 1, sizeof (float)*vlen)), + : sync_block ("multiply_const_ff", + io_signature::make (1, 1, sizeof (float)*vlen), + io_signature::make (1, 1, sizeof (float)*vlen)), d_k(k), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/multiply_const_ff_impl.h b/gr-blocks/lib/multiply_const_ff_impl.h index e63a3279a..976d0a750 100644 --- a/gr-blocks/lib/multiply_const_ff_impl.h +++ b/gr-blocks/lib/multiply_const_ff_impl.h @@ -25,7 +25,7 @@ #ifndef INCLUDED_MULTIPLY_CONST_FF_IMPL_H #define INCLUDED_MULTIPLY_CONST_FF_IMPL_H -#include <blocks/multiply_const_ff.h> +#include <gnuradio/blocks/multiply_const_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_const_vXX_impl.cc.t b/gr-blocks/lib/multiply_const_vXX_impl.cc.t index dd20f2893..55b3d3e41 100644 --- a/gr-blocks/lib/multiply_const_vXX_impl.cc.t +++ b/gr-blocks/lib/multiply_const_vXX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(std::vector<@O_TYPE@> k) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)*k.size()), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*k.size())), + : sync_block ("@NAME@", + io_signature::make (1, 1, sizeof (@I_TYPE@)*k.size()), + io_signature::make (1, 1, sizeof (@O_TYPE@)*k.size())), d_k(k) { } diff --git a/gr-blocks/lib/multiply_const_vXX_impl.h.t b/gr-blocks/lib/multiply_const_vXX_impl.h.t index a7a619725..6c087d946 100644 --- a/gr-blocks/lib/multiply_const_vXX_impl.h.t +++ b/gr-blocks/lib/multiply_const_vXX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/multiply_ff_impl.cc b/gr-blocks/lib/multiply_ff_impl.cc index 6e8f27711..912c1bb92 100644 --- a/gr-blocks/lib/multiply_ff_impl.cc +++ b/gr-blocks/lib/multiply_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include <multiply_ff_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } multiply_ff_impl::multiply_ff_impl(size_t vlen) - : gr_sync_block("multiply_ff", - gr_make_io_signature (1, -1, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("multiply_ff", + io_signature::make (1, -1, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/multiply_ff_impl.h b/gr-blocks/lib/multiply_ff_impl.h index 2c5325a98..e084b0e49 100644 --- a/gr-blocks/lib/multiply_ff_impl.h +++ b/gr-blocks/lib/multiply_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_MULTIPLY_FF_IMPL_H #define INCLUDED_BLOCKS_MULTIPLY_FF_IMPL_H -#include <blocks/multiply_ff.h> +#include <gnuradio/blocks/multiply_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/mute_XX_impl.cc.t b/gr-blocks/lib/mute_XX_impl.cc.t index b29e9edad..af46dc221 100644 --- a/gr-blocks/lib/mute_XX_impl.cc.t +++ b/gr-blocks/lib/mute_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -41,9 +41,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(bool mute) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_mute(mute) { } diff --git a/gr-blocks/lib/mute_XX_impl.h.t b/gr-blocks/lib/mute_XX_impl.h.t index de93c8eb8..b519bb20a 100644 --- a/gr-blocks/lib/mute_XX_impl.h.t +++ b/gr-blocks/lib/mute_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/nlog10_ff_impl.cc b/gr-blocks/lib/nlog10_ff_impl.cc index f662b8fd5..bed2da4d0 100644 --- a/gr-blocks/lib/nlog10_ff_impl.cc +++ b/gr-blocks/lib/nlog10_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "nlog10_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } nlog10_ff_impl::nlog10_ff_impl(float n, size_t vlen, float k) - : gr_sync_block("nlog10_ff", - gr_make_io_signature (1, 1, sizeof(float)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("nlog10_ff", + io_signature::make (1, 1, sizeof(float)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_n(n), d_vlen(vlen), d_k(k) { } diff --git a/gr-blocks/lib/nlog10_ff_impl.h b/gr-blocks/lib/nlog10_ff_impl.h index 3789bc317..293590436 100644 --- a/gr-blocks/lib/nlog10_ff_impl.h +++ b/gr-blocks/lib/nlog10_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NLOG10_FF_IMPL_H #define INCLUDED_NLOG10_FF_IMPL_H -#include <blocks/nlog10_ff.h> +#include <gnuradio/blocks/nlog10_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc index 387eda0ba..da1398e51 100644 --- a/gr-blocks/lib/nop_impl.cc +++ b/gr-blocks/lib/nop_impl.cc @@ -25,7 +25,7 @@ #endif #include "nop_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <boost/bind.hpp> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } nop_impl::nop_impl (size_t sizeof_stream_item) - : gr_block("nop", - gr_make_io_signature(0, -1, sizeof_stream_item), - gr_make_io_signature(0, -1, sizeof_stream_item)), + : block("nop", + io_signature::make(0, -1, sizeof_stream_item), + io_signature::make(0, -1, sizeof_stream_item)), d_nmsgs_recvd(0) { // Arrange to have count_received_msgs called when messages are received. diff --git a/gr-blocks/lib/nop_impl.h b/gr-blocks/lib/nop_impl.h index e01e8fc9d..a76b2a328 100644 --- a/gr-blocks/lib/nop_impl.h +++ b/gr-blocks/lib/nop_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_NOP_IMPL_H #define INCLUDED_GR_NOP_IMPL_H -#include <blocks/nop.h> +#include <gnuradio/blocks/nop.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/not_XX_impl.cc.t b/gr-blocks/lib/not_XX_impl.cc.t index b491a4ccc..cb9be5cdb 100644 --- a/gr-blocks/lib/not_XX_impl.cc.t +++ b/gr-blocks/lib/not_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, 1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/not_XX_impl.h.t b/gr-blocks/lib/not_XX_impl.h.t index 25f0da0c8..f7db3f216 100644 --- a/gr-blocks/lib/not_XX_impl.h.t +++ b/gr-blocks/lib/not_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/null_sink_impl.cc b/gr-blocks/lib/null_sink_impl.cc index b780a2405..41adeea0f 100644 --- a/gr-blocks/lib/null_sink_impl.cc +++ b/gr-blocks/lib/null_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "null_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } null_sink_impl::null_sink_impl(size_t sizeof_stream_item) - : gr_sync_block("null_sink", - gr_make_io_signature(1, 1, sizeof_stream_item), - gr_make_io_signature(0, 0, 0)) + : sync_block("null_sink", + io_signature::make(1, 1, sizeof_stream_item), + io_signature::make(0, 0, 0)) { } diff --git a/gr-blocks/lib/null_sink_impl.h b/gr-blocks/lib/null_sink_impl.h index bb4c695c2..948bc19de 100644 --- a/gr-blocks/lib/null_sink_impl.h +++ b/gr-blocks/lib/null_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_NULL_SINK_IMPL_H #define INCLUDED_GR_NULL_SINK_IMPL_H -#include <blocks/null_sink.h> +#include <gnuradio/blocks/null_sink.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/null_source_impl.cc b/gr-blocks/lib/null_source_impl.cc index 81999d050..edf0104da 100644 --- a/gr-blocks/lib/null_source_impl.cc +++ b/gr-blocks/lib/null_source_impl.cc @@ -25,7 +25,7 @@ #endif #include "null_source_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } null_source_impl::null_source_impl (size_t sizeof_stream_item) - : gr_sync_block("null_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof_stream_item)) + : sync_block("null_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof_stream_item)) { } diff --git a/gr-blocks/lib/null_source_impl.h b/gr-blocks/lib/null_source_impl.h index 36201d54b..887c77d42 100644 --- a/gr-blocks/lib/null_source_impl.h +++ b/gr-blocks/lib/null_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_NULL_SOURCE_IMPL_H #define INCLUDED_GR_NULL_SOURCE_IMPL_H -#include <blocks/null_source.h> +#include <gnuradio/blocks/null_source.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/or_XX_impl.cc.t b/gr-blocks/lib/or_XX_impl.cc.t index 15f6fa0b8..95586e4fa 100644 --- a/gr-blocks/lib/or_XX_impl.cc.t +++ b/gr-blocks/lib/or_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/or_XX_impl.h.t b/gr-blocks/lib/or_XX_impl.h.t index 25f0da0c8..f7db3f216 100644 --- a/gr-blocks/lib/or_XX_impl.h.t +++ b/gr-blocks/lib/or_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc index 2a7fcc04c..9009c89ab 100644 --- a/gr-blocks/lib/pack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "pack_k_bits_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <iostream> @@ -40,9 +40,9 @@ namespace gr { } pack_k_bits_bb_impl::pack_k_bits_bb_impl(unsigned k) - : gr_sync_decimator("pack_k_bits_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char)), + : sync_decimator("pack_k_bits_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char)), k), d_k(k) { diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.h b/gr-blocks/lib/pack_k_bits_bb_impl.h index 668d438a4..dfe859478 100644 --- a/gr-blocks/lib/pack_k_bits_bb_impl.h +++ b/gr-blocks/lib/pack_k_bits_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_PACK_K_BITS_BB_IMPL_H #define INCLUDED_GR_PACK_K_BITS_BB_IMPL_H -#include <blocks/pack_k_bits_bb.h> +#include <gnuradio/blocks/pack_k_bits_bb.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t b/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t index 4f34d8347..8ac22bdf8 100644 --- a/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t +++ b/gr-blocks/lib/packed_to_unpacked_XX_impl.cc.t @@ -27,8 +27,8 @@ #endif #include "@NAME_IMPL@.h" -#include <gr_io_signature.h> -#include <blocks/log2_const.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/log2_const.h> #include <assert.h> namespace gr { @@ -39,17 +39,17 @@ namespace gr { @NAME@::sptr @NAME@::make(unsigned int bits_per_chunk, - gr_endianness_t endianness) + endianness_t endianness) { return gnuradio::get_initial_sptr (new @NAME_IMPL@(bits_per_chunk, endianness)); } @NAME_IMPL@::@NAME_IMPL@(unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block("@NAME@", - gr_make_io_signature(1, -1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, -1, sizeof(@O_TYPE@))), + endianness_t endianness) + : block("@NAME@", + io_signature::make(1, -1, sizeof(@I_TYPE@)), + io_signature::make(1, -1, sizeof(@O_TYPE@))), d_bits_per_chunk(bits_per_chunk), d_endianness(endianness), d_index(0) { assert(bits_per_chunk <= BITS_PER_TYPE); diff --git a/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t b/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t index f83496fa7..3f8b15c1a 100644 --- a/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t +++ b/gr-blocks/lib/packed_to_unpacked_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { @@ -34,12 +34,12 @@ namespace gr { { private: unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; + endianness_t d_endianness; unsigned int d_index; public: @NAME_IMPL@(unsigned int bits_per_chunk, - gr_endianness_t endianness); + endianness_t endianness); ~@NAME_IMPL@(); void forecast(int noutput_items, diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc index 437c733a1..ba298afc8 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.cc +++ b/gr-blocks/lib/patterned_interleaver_impl.cc @@ -25,7 +25,7 @@ #endif #include "patterned_interleaver_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, std::vector<int> pattern) - : gr_block ("patterned_interleaver", - gr_make_io_signature (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize), - gr_make_io_signature (1, 1, itemsize)), + : block ("patterned_interleaver", + io_signature::make (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize), + io_signature::make (1, 1, itemsize)), d_pattern(pattern), d_counts( pattern_max(pattern)+1, 0), d_itemsize(itemsize) { BOOST_FOREACH( int i, d_pattern) diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h index 4266c9636..2401480ad 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.h +++ b/gr-blocks/lib/patterned_interleaver_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PATTERNED_INTERLEAVER_IMPL_H #define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H -#include <blocks/patterned_interleaver.h> +#include <gnuradio/blocks/patterned_interleaver.h> #include <boost/foreach.hpp> namespace gr { diff --git a/gr-blocks/lib/pdu.cc b/gr-blocks/lib/pdu.cc index 9d5322bfe..0c3e3aa33 100644 --- a/gr-blocks/lib/pdu.cc +++ b/gr-blocks/lib/pdu.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <blocks/pdu.h> +#include <gnuradio/blocks/pdu.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc index 1fc4857f2..d6ad78cb9 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc @@ -25,8 +25,8 @@ #endif #include "pdu_to_tagged_stream_impl.h" -#include <blocks/pdu.h> -#include <gr_io_signature.h> +#include <gnuradio/blocks/pdu.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } pdu_to_tagged_stream_impl::pdu_to_tagged_stream_impl(pdu::vector_type type) - : gr_sync_block("pdu_to_tagged_stream", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, pdu::itemsize(type))), + : sync_block("pdu_to_tagged_stream", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, pdu::itemsize(type))), d_itemsize(pdu::itemsize(type)), d_type(type) { diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.h b/gr-blocks/lib/pdu_to_tagged_stream_impl.h index ca1c6437b..8b3d13c92 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.h +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PDU_TO_TAGGED_STREAM_IMPL_H #define INCLUDED_PDU_TO_TAGGED_STREAM_IMPL_H -#include <blocks/pdu_to_tagged_stream.h> +#include <gnuradio/blocks/pdu_to_tagged_stream.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/peak_detector2_fb_impl.cc b/gr-blocks/lib/peak_detector2_fb_impl.cc index 0d375c3ba..dd1b67722 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.cc +++ b/gr-blocks/lib/peak_detector2_fb_impl.cc @@ -25,7 +25,7 @@ #endif #include "peak_detector2_fb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -42,9 +42,9 @@ namespace gr { peak_detector2_fb_impl::peak_detector2_fb_impl(float threshold_factor_rise, int look_ahead, float alpha) - : gr_sync_block("peak_detector2_fb", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature2(1, 2, sizeof(char), sizeof(float))), + : sync_block("peak_detector2_fb", + io_signature::make(1, 1, sizeof(float)), + io_signature::make2(1, 2, sizeof(char), sizeof(float))), d_threshold_factor_rise(threshold_factor_rise), d_look_ahead(look_ahead), d_alpha(alpha), d_avg(0.0f), d_found(false) { diff --git a/gr-blocks/lib/peak_detector2_fb_impl.h b/gr-blocks/lib/peak_detector2_fb_impl.h index f03dd36a8..53c06ca81 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.h +++ b/gr-blocks/lib/peak_detector2_fb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_IMPL_H #define INCLUDED_GR_PEAK_DETECTOR2_FB_IMPL_H -#include <blocks/peak_detector2_fb.h> +#include <gnuradio/blocks/peak_detector2_fb.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/peak_detector_XX_impl.cc.t b/gr-blocks/lib/peak_detector_XX_impl.cc.t index 27518962f..6846a02df 100644 --- a/gr-blocks/lib/peak_detector_XX_impl.cc.t +++ b/gr-blocks/lib/peak_detector_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME_IMPL@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -47,9 +47,9 @@ namespace gr { @NAME_IMPL@::@NAME_IMPL@(float threshold_factor_rise, float threshold_factor_fall, int look_ahead, float alpha) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(char))), + : sync_block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(char))), d_threshold_factor_rise(threshold_factor_rise), d_threshold_factor_fall(threshold_factor_fall), d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0) diff --git a/gr-blocks/lib/peak_detector_XX_impl.h.t b/gr-blocks/lib/peak_detector_XX_impl.h.t index ef52f0f74..ed364a490 100644 --- a/gr-blocks/lib/peak_detector_XX_impl.h.t +++ b/gr-blocks/lib/peak_detector_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/plateau_detector_fb_impl.cc b/gr-blocks/lib/plateau_detector_fb_impl.cc index f68ef6463..0c35a32f6 100644 --- a/gr-blocks/lib/plateau_detector_fb_impl.cc +++ b/gr-blocks/lib/plateau_detector_fb_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "plateau_detector_fb_impl.h" namespace gr { @@ -38,9 +38,9 @@ namespace gr { } plateau_detector_fb_impl::plateau_detector_fb_impl(int max_len, float threshold) - : gr_sync_block("plateau_detector_fb", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(char))), + : sync_block("plateau_detector_fb", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(char))), d_max_len(max_len), d_threshold(threshold) {} diff --git a/gr-blocks/lib/plateau_detector_fb_impl.h b/gr-blocks/lib/plateau_detector_fb_impl.h index 67682d00f..6497f0e83 100644 --- a/gr-blocks/lib/plateau_detector_fb_impl.h +++ b/gr-blocks/lib/plateau_detector_fb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_IMPL_H #define INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_IMPL_H -#include <blocks/plateau_detector_fb.h> +#include <gnuradio/blocks/plateau_detector_fb.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/probe_rate_impl.cc b/gr-blocks/lib/probe_rate_impl.cc index 37749c85e..418d9d401 100644 --- a/gr-blocks/lib/probe_rate_impl.cc +++ b/gr-blocks/lib/probe_rate_impl.cc @@ -25,7 +25,7 @@ #endif #include "probe_rate_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } probe_rate_impl::probe_rate_impl(size_t itemsize, double update_rate_ms, double alpha) : - gr_sync_block("probe_rate", - gr_make_io_signature(1,1,itemsize), - gr_make_io_signature(0,0,itemsize)), + sync_block("probe_rate", + io_signature::make(1,1,itemsize), + io_signature::make(0,0,itemsize)), d_alpha(alpha), d_beta(1.0-alpha), d_avg(0), diff --git a/gr-blocks/lib/probe_rate_impl.h b/gr-blocks/lib/probe_rate_impl.h index 139fc3487..a1c69ba18 100644 --- a/gr-blocks/lib/probe_rate_impl.h +++ b/gr-blocks/lib/probe_rate_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_PROBE_RATE_IMPL_H #define INCLUDED_GR_PROBE_RATE_IMPL_H -#include <blocks/probe_rate.h> +#include <gnuradio/blocks/probe_rate.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/probe_signal_X_impl.cc.t b/gr-blocks/lib/probe_signal_X_impl.cc.t index 4cda4e527..1bc2793af 100644 --- a/gr-blocks/lib/probe_signal_X_impl.cc.t +++ b/gr-blocks/lib/probe_signal_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@() - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@TYPE@)), - gr_make_io_signature(0, 0, 0)), + : sync_block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@TYPE@)), + io_signature::make(0, 0, 0)), d_level(0) { } diff --git a/gr-blocks/lib/probe_signal_X_impl.h.t b/gr-blocks/lib/probe_signal_X_impl.h.t index 9c3d05bec..c20994877 100644 --- a/gr-blocks/lib/probe_signal_X_impl.h.t +++ b/gr-blocks/lib/probe_signal_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/probe_signal_vX_impl.cc.t b/gr-blocks/lib/probe_signal_vX_impl.cc.t index bd520b0bc..5865bde41 100644 --- a/gr-blocks/lib/probe_signal_vX_impl.cc.t +++ b/gr-blocks/lib/probe_signal_vX_impl.cc.t @@ -28,7 +28,7 @@ #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -41,9 +41,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t size) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, 1, size*sizeof(@TYPE@)), - gr_make_io_signature(0, 0, 0)), + : sync_block("@BASE_NAME@", + io_signature::make(1, 1, size*sizeof(@TYPE@)), + io_signature::make(0, 0, 0)), d_level(size, 0), d_size(size) { } diff --git a/gr-blocks/lib/probe_signal_vX_impl.h.t b/gr-blocks/lib/probe_signal_vX_impl.h.t index 1424334a7..434eb44ac 100644 --- a/gr-blocks/lib/probe_signal_vX_impl.h.t +++ b/gr-blocks/lib/probe_signal_vX_impl.h.t @@ -26,7 +26,7 @@ #define @GUARD_NAME_IMPL@ #include <vector> -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/qa_block_tags.cc b/gr-blocks/lib/qa_block_tags.cc index f3139245d..c554425f8 100644 --- a/gr-blocks/lib/qa_block_tags.cc +++ b/gr-blocks/lib/qa_block_tags.cc @@ -25,21 +25,19 @@ #endif #include <qa_block_tags.h> -#include <gr_block.h> -#include <gr_top_block.h> -#include <blocks/null_source.h> -#include <blocks/null_sink.h> -#include <blocks/head.h> -#include <blocks/annotator_alltoall.h> -#include <blocks/annotator_1to1.h> -#include <blocks/keep_one_in_n.h> -#include <gr_tags.h> +#include <gnuradio/block.h> +#include <gnuradio/top_block.h> +#include <gnuradio/blocks/null_source.h> +#include <gnuradio/blocks/null_sink.h> +#include <gnuradio/blocks/head.h> +#include <gnuradio/blocks/annotator_alltoall.h> +#include <gnuradio/blocks/annotator_1to1.h> +#include <gnuradio/blocks/keep_one_in_n.h> +#include <gnuradio/tags.h> // ---------------------------------------------------------------- -using namespace pmt; - // set to 1 to turn on debug output // The debug output fully checks that the tags seen are what are expected. While // this behavior currently works with our implementation, there is no guarentee @@ -53,10 +51,10 @@ void qa_block_tags::t0() { unsigned int N = 1000; - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(int))); - gr_block_sptr head (gr::blocks::head::make(sizeof(int), N)); - gr_block_sptr snk (gr::blocks::null_sink::make(sizeof(int))); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(int))); + gr::block_sptr head (gr::blocks::head::make(sizeof(int), N)); + gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(int))); tb->connect(src, 0, head, 0); tb->connect(head, 0, snk, 0); @@ -79,16 +77,16 @@ void qa_block_tags::t1() { int N = 40000; - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(int))); - gr_block_sptr head (gr::blocks::head::make(sizeof(int), N)); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(int))); + gr::block_sptr head (gr::blocks::head::make(sizeof(int), N)); gr::blocks::annotator_alltoall::sptr ann0(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann1(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann2(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann3(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann4(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); - gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); - gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); tb->connect(src, 0, head, 0); tb->connect(head, 0, ann0, 0); @@ -103,9 +101,9 @@ qa_block_tags::t1() tb->run(); - std::vector<gr_tag_t> tags0 = ann0->data(); - std::vector<gr_tag_t> tags3 = ann3->data(); - std::vector<gr_tag_t> tags4 = ann4->data(); + std::vector<gr::tag_t> tags0 = ann0->data(); + std::vector<gr::tag_t> tags3 = ann3->data(); + std::vector<gr::tag_t> tags4 = ann4->data(); // The first annotator does not receive any tags from the null sink upstream CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0); @@ -119,7 +117,7 @@ qa_block_tags::t1() str1 << ann1->name() << ann1->unique_id(); str2 << ann2->name() << ann2->unique_id(); - pmt_t expected_tags3[8]; + pmt::pmt_t expected_tags3[8]; expected_tags3[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(0)); expected_tags3[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0)); expected_tags3[2] = mp(pmt::from_uint64(10000), mp(str1.str()), mp("seq"), mp(1)); @@ -129,7 +127,7 @@ qa_block_tags::t1() expected_tags3[6] = mp(pmt::from_uint64(30000), mp(str1.str()), mp("seq"), mp(3)); expected_tags3[7] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(6)); - pmt_t expected_tags4[8]; + pmt::pmt_t expected_tags4[8]; expected_tags4[0] = mp(pmt::from_uint64(0), mp(str2.str()), mp("seq"), mp(0)); expected_tags4[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1)); expected_tags4[2] = mp(pmt::from_uint64(10000), mp(str2.str()), mp("seq"), mp(1)); @@ -160,17 +158,17 @@ void qa_block_tags::t2 () { int N = 40000; - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(int))); - gr_block_sptr head (gr::blocks::head::make(sizeof(int), N)); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(int))); + gr::block_sptr head (gr::blocks::head::make(sizeof(int), N)); gr::blocks::annotator_alltoall::sptr ann0(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann1(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann2(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann3(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann4(gr::blocks::annotator_alltoall::make(10000, sizeof(int))); - gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); - gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); - gr_block_sptr snk2 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk2 (gr::blocks::null_sink::make(sizeof(int))); tb->connect(src, 0, head, 0); tb->connect(head, 0, ann0, 0); @@ -187,11 +185,11 @@ qa_block_tags::t2 () tb->run(); - std::vector<gr_tag_t> tags0 = ann0->data(); - std::vector<gr_tag_t> tags1 = ann1->data(); - std::vector<gr_tag_t> tags2 = ann2->data(); - std::vector<gr_tag_t> tags3 = ann4->data(); - std::vector<gr_tag_t> tags4 = ann4->data(); + std::vector<gr::tag_t> tags0 = ann0->data(); + std::vector<gr::tag_t> tags1 = ann1->data(); + std::vector<gr::tag_t> tags2 = ann2->data(); + std::vector<gr::tag_t> tags3 = ann4->data(); + std::vector<gr::tag_t> tags4 = ann4->data(); // The first annotator does not receive any tags from the null sink upstream CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0); @@ -209,7 +207,7 @@ qa_block_tags::t2 () str0 << ann0->name() << ann0->unique_id(); str1 << ann1->name() << ann1->unique_id(); - pmt_t expected_tags2[12]; + pmt::pmt_t expected_tags2[12]; expected_tags2[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(0)); expected_tags2[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0)); expected_tags2[2] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1)); @@ -223,7 +221,7 @@ qa_block_tags::t2 () expected_tags2[10] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(6)); expected_tags2[11] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(7)); - pmt_t expected_tags4[12]; + pmt::pmt_t expected_tags4[12]; expected_tags4[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(2)); expected_tags4[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0)); expected_tags4[2] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1)); @@ -261,16 +259,16 @@ void qa_block_tags::t3() { int N = 40000; - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(int))); - gr_block_sptr head (gr::blocks::head::make(sizeof(int), N)); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(int))); + gr::block_sptr head (gr::blocks::head::make(sizeof(int), N)); gr::blocks::annotator_1to1::sptr ann0 (gr::blocks::annotator_1to1::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann1 (gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_alltoall::sptr ann2 (gr::blocks::annotator_alltoall::make(10000, sizeof(int))); gr::blocks::annotator_1to1::sptr ann3 (gr::blocks::annotator_1to1::make(10000, sizeof(int))); gr::blocks::annotator_1to1::sptr ann4 (gr::blocks::annotator_1to1::make(10000, sizeof(int))); - gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); - gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); tb->connect(src, 0, head, 0); tb->connect(head, 0, ann0, 0); @@ -287,9 +285,9 @@ qa_block_tags::t3() tb->run(); - std::vector<gr_tag_t> tags0 = ann0->data(); - std::vector<gr_tag_t> tags3 = ann3->data(); - std::vector<gr_tag_t> tags4 = ann4->data(); + std::vector<gr::tag_t> tags0 = ann0->data(); + std::vector<gr::tag_t> tags3 = ann3->data(); + std::vector<gr::tag_t> tags4 = ann4->data(); // The first annotator does not receive any tags from the null sink upstream CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0); @@ -303,7 +301,7 @@ qa_block_tags::t3() str1 << ann1->name() << ann1->unique_id(); str2 << ann2->name() << ann2->unique_id(); - pmt_t expected_tags3[8]; + pmt::pmt_t expected_tags3[8]; expected_tags3[0] = mp(pmt::from_uint64(0), mp(str1.str()), mp("seq"), mp(0)); expected_tags3[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(0)); expected_tags3[2] = mp(pmt::from_uint64(10000), mp(str1.str()), mp("seq"), mp(1)); @@ -313,7 +311,7 @@ qa_block_tags::t3() expected_tags3[6] = mp(pmt::from_uint64(30000), mp(str1.str()), mp("seq"), mp(3)); expected_tags3[7] = mp(pmt::from_uint64(30000), mp(str0.str()), mp("seq"), mp(6)); - pmt_t expected_tags4[8]; + pmt::pmt_t expected_tags4[8]; expected_tags4[0] = mp(pmt::from_uint64(0), mp(str2.str()), mp("seq"), mp(0)); expected_tags4[1] = mp(pmt::from_uint64(0), mp(str0.str()), mp("seq"), mp(1)); expected_tags4[2] = mp(pmt::from_uint64(10000), mp(str2.str()), mp("seq"), mp(1)); @@ -345,14 +343,14 @@ void qa_block_tags::t4() { int N = 40000; - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(int))); - gr_block_sptr head (gr::blocks::head::make(sizeof(int), N)); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(int))); + gr::block_sptr head (gr::blocks::head::make(sizeof(int), N)); gr::blocks::annotator_1to1::sptr ann0(gr::blocks::annotator_1to1::make(10000, sizeof(int))); gr::blocks::annotator_1to1::sptr ann1(gr::blocks::annotator_1to1::make(10000, sizeof(int))); gr::blocks::annotator_1to1::sptr ann2(gr::blocks::annotator_1to1::make(10000, sizeof(int))); - gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); - gr_block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr snk1 (gr::blocks::null_sink::make(sizeof(int))); // using 1-to-1 tag propagation without having equal number of // ins and outs. Make sure this works; will just exit run early. @@ -364,7 +362,7 @@ qa_block_tags::t4() tb->connect(ann2, 0, snk1, 0); std::cerr << std::endl - << "NOTE: This is supposed to produce an error from gr_block_executor" + << "NOTE: This is supposed to produce an error from block_executor" << std::endl; tb->run(); } @@ -374,13 +372,13 @@ void qa_block_tags::t5() { int N = 40000; - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(float))); - gr_block_sptr head (gr::blocks::head::make(sizeof(float), N)); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(float))); + gr::block_sptr head (gr::blocks::head::make(sizeof(float), N)); gr::blocks::annotator_alltoall::sptr ann0(gr::blocks::annotator_alltoall::make(10000, sizeof(float))); gr::blocks::annotator_alltoall::sptr ann1(gr::blocks::annotator_alltoall::make(10000, sizeof(float))); gr::blocks::annotator_alltoall::sptr ann2(gr::blocks::annotator_alltoall::make(1000, sizeof(float))); - gr_block_sptr snk0 (gr::blocks::null_sink::make(sizeof(float))); + gr::block_sptr snk0 (gr::blocks::null_sink::make(sizeof(float))); // Rate change blocks gr::blocks::keep_one_in_n::sptr dec10(gr::blocks::keep_one_in_n::make(sizeof(float), 10)); @@ -394,9 +392,9 @@ qa_block_tags::t5() tb->run(); - std::vector<gr_tag_t> tags0 = ann0->data(); - std::vector<gr_tag_t> tags1 = ann1->data(); - std::vector<gr_tag_t> tags2 = ann2->data(); + std::vector<gr::tag_t> tags0 = ann0->data(); + std::vector<gr::tag_t> tags1 = ann1->data(); + std::vector<gr::tag_t> tags2 = ann2->data(); // The first annotator does not receive any tags from the null sink upstream CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0); diff --git a/gr-blocks/lib/qa_blocks.cc b/gr-blocks/lib/qa_blocks.cc index 409b5d576..149ef7aa7 100644 --- a/gr-blocks/lib/qa_blocks.cc +++ b/gr-blocks/lib/qa_blocks.cc @@ -30,7 +30,7 @@ #include <qa_rotator.h> CppUnit::TestSuite * -qa_gr_blocks::suite() +qa_blocks::suite() { CppUnit::TestSuite *s = new CppUnit::TestSuite("gr-blocks"); diff --git a/gr-blocks/lib/qa_blocks.h b/gr-blocks/lib/qa_blocks.h index ad538134b..4d5287845 100644 --- a/gr-blocks/lib/qa_blocks.h +++ b/gr-blocks/lib/qa_blocks.h @@ -23,12 +23,12 @@ #ifndef _QA_GR_BLOCKS_H_ #define _QA_GR_BLOCKS_H_ -#include <attributes.h> +#include <gnuradio/attributes.h> #include <cppunit/TestSuite.h> //! collect all the tests for the gr-blocks directory -class __GR_ATTR_EXPORT qa_gr_blocks +class __GR_ATTR_EXPORT qa_blocks { public: //! return suite of tests for all of gr-blocks directory diff --git a/gr-blocks/lib/qa_gr_block.cc b/gr-blocks/lib/qa_gr_block.cc index 7f4a01bbd..5df1b217d 100644 --- a/gr-blocks/lib/qa_gr_block.cc +++ b/gr-blocks/lib/qa_gr_block.cc @@ -25,20 +25,20 @@ #endif #include <qa_gr_block.h> -#include <gr_block.h> -#include <gr_io_signature.h> -#include <blocks/null_sink.h> -#include <blocks/null_source.h> +#include <gnuradio/block.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/null_sink.h> +#include <gnuradio/blocks/null_source.h> // ---------------------------------------------------------------- void -qa_gr_block::t0 () +qa_block::t0 () { // test creation of sources - gr_block_sptr src1(gr::blocks::null_source::make(sizeof (int))); + gr::block_sptr src1(gr::blocks::null_source::make(sizeof (int))); CPPUNIT_ASSERT_EQUAL(std::string("null_source"), src1->name ()); CPPUNIT_ASSERT_EQUAL(0, src1->input_signature()->max_streams ()); CPPUNIT_ASSERT_EQUAL(1, src1->output_signature()->min_streams ()); @@ -46,7 +46,7 @@ qa_gr_block::t0 () CPPUNIT_ASSERT_EQUAL((int) sizeof(int), src1->output_signature()->sizeof_stream_item (0)); - gr_block_sptr src2(gr::blocks::null_source::make(sizeof(short))); + gr::block_sptr src2(gr::blocks::null_source::make(sizeof(short))); CPPUNIT_ASSERT_EQUAL(std::string ("null_source"), src2->name ()); CPPUNIT_ASSERT_EQUAL(0, src2->input_signature()->max_streams ()); CPPUNIT_ASSERT_EQUAL(1, src2->output_signature()->min_streams ()); @@ -57,10 +57,10 @@ qa_gr_block::t0 () void -qa_gr_block::t1 () +qa_block::t1 () { // test creation of sinks - gr_block_sptr dst1 (gr::blocks::null_sink::make (sizeof (int))); + gr::block_sptr dst1 (gr::blocks::null_sink::make (sizeof (int))); CPPUNIT_ASSERT_EQUAL (std::string ("null_sink"), dst1->name ()); CPPUNIT_ASSERT_EQUAL (1, dst1->input_signature()->min_streams ()); CPPUNIT_ASSERT_EQUAL (1, dst1->input_signature()->max_streams ()); @@ -69,7 +69,7 @@ qa_gr_block::t1 () CPPUNIT_ASSERT_EQUAL (0, dst1->output_signature()->max_streams ()); - gr_block_sptr dst2 (gr::blocks::null_sink::make (sizeof (short))); + gr::block_sptr dst2 (gr::blocks::null_sink::make (sizeof (short))); CPPUNIT_ASSERT_EQUAL (std::string ("null_sink"), dst2->name ()); CPPUNIT_ASSERT_EQUAL (1, dst2->input_signature()->min_streams ()); CPPUNIT_ASSERT_EQUAL (1, dst2->input_signature()->max_streams ()); @@ -79,11 +79,11 @@ qa_gr_block::t1 () } void -qa_gr_block::t2 () +qa_block::t2 () { } void -qa_gr_block::t3 () +qa_block::t3 () { } diff --git a/gr-blocks/lib/qa_gr_block.h b/gr-blocks/lib/qa_gr_block.h index 14c7c40d1..06eb60f6e 100644 --- a/gr-blocks/lib/qa_gr_block.h +++ b/gr-blocks/lib/qa_gr_block.h @@ -27,9 +27,9 @@ #include <cppunit/TestCase.h> #include <stdexcept> -class qa_gr_block : public CppUnit::TestCase { +class qa_block : public CppUnit::TestCase { - CPPUNIT_TEST_SUITE (qa_gr_block); + CPPUNIT_TEST_SUITE (qa_block); CPPUNIT_TEST (t0); CPPUNIT_TEST (t1); CPPUNIT_TEST (t2); diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc index 1a3006039..a6d151616 100644 --- a/gr-blocks/lib/qa_gr_flowgraph.cc +++ b/gr-blocks/lib/qa_gr_flowgraph.cc @@ -26,9 +26,9 @@ #include <qa_gr_flowgraph.h> #include <gr_flowgraph.h> -#include <blocks/nop.h> -#include <blocks/null_source.h> -#include <blocks/null_sink.h> +#include <gnuradio/blocks/nop.h> +#include <gnuradio/blocks/null_source.h> +#include <gnuradio/blocks/null_sink.h> void qa_gr_flowgraph::t0() { @@ -41,8 +41,8 @@ void qa_gr_flowgraph::t1_connect() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); } @@ -51,8 +51,8 @@ void qa_gr_flowgraph::t2_connect_invalid_src_port_neg() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); CPPUNIT_ASSERT_THROW(fg->connect(nop1, -1, nop2, 0), std::invalid_argument); } @@ -61,8 +61,8 @@ void qa_gr_flowgraph::t3_connect_src_port_exceeds() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + block_sptr src = gr::blocks::null_source::make(sizeof(int)); + block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); CPPUNIT_ASSERT_THROW(fg->connect(src, 1, dst, 0), std::invalid_argument); } @@ -71,8 +71,8 @@ void qa_gr_flowgraph::t4_connect_invalid_dst_port_neg() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); CPPUNIT_ASSERT_THROW(fg->connect(nop1, 0, nop2, -1), std::invalid_argument); } @@ -81,8 +81,8 @@ void qa_gr_flowgraph::t5_connect_dst_port_exceeds() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + block_sptr src = gr::blocks::null_source::make(sizeof(int)); + block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); CPPUNIT_ASSERT_THROW(fg->connect(src, 0, dst, 1), std::invalid_argument); } @@ -91,9 +91,9 @@ void qa_gr_flowgraph::t6_connect_dst_in_use() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr src1 = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr src2 = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + block_sptr src1 = gr::blocks::null_source::make(sizeof(int)); + block_sptr src2 = gr::blocks::null_source::make(sizeof(int)); + block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); fg->connect(src1, 0, dst, 0); CPPUNIT_ASSERT_THROW(fg->connect(src2, 0, dst, 0), std::invalid_argument); @@ -103,9 +103,9 @@ void qa_gr_flowgraph::t7_connect_one_src_two_dst() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr dst1 = gr::blocks::null_sink::make(sizeof(int)); - gr_block_sptr dst2 = gr::blocks::null_sink::make(sizeof(int)); + block_sptr src = gr::blocks::null_source::make(sizeof(int)); + block_sptr dst1 = gr::blocks::null_sink::make(sizeof(int)); + block_sptr dst2 = gr::blocks::null_sink::make(sizeof(int)); fg->connect(src, 0, dst1, 0); fg->connect(src, 0, dst2, 0); @@ -115,8 +115,8 @@ void qa_gr_flowgraph::t8_connect_type_mismatch() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(char)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(char)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); CPPUNIT_ASSERT_THROW(fg->connect(nop1, 0, nop2, 0), std::invalid_argument); } @@ -125,8 +125,8 @@ void qa_gr_flowgraph::t9_disconnect() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); fg->disconnect(nop1, 0, nop2, 0); @@ -136,9 +136,9 @@ void qa_gr_flowgraph::t10_disconnect_unconnected_block() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop3 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop3 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); CPPUNIT_ASSERT_THROW(fg->disconnect(nop1, 0, nop3, 0), std::invalid_argument); @@ -148,8 +148,8 @@ void qa_gr_flowgraph::t11_disconnect_unconnected_port() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); CPPUNIT_ASSERT_THROW(fg->disconnect(nop1, 0, nop2, 1), std::invalid_argument); @@ -159,8 +159,8 @@ void qa_gr_flowgraph::t12_validate() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); fg->validate(); @@ -170,8 +170,8 @@ void qa_gr_flowgraph::t13_validate_missing_input_assignment() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); fg->connect(nop1, 0, nop2, 2); @@ -182,8 +182,8 @@ void qa_gr_flowgraph::t14_validate_missing_output_assignment() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); fg->connect(nop1, 2, nop2, 1); @@ -194,8 +194,8 @@ void qa_gr_flowgraph::t15_clear() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop1 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop2 = gr::blocks::nop::make(sizeof(int)); fg->connect(nop1, 0, nop2, 0); @@ -212,17 +212,17 @@ void qa_gr_flowgraph::t16_partition() { gr_flowgraph_sptr fg = gr_make_flowgraph(); - gr_block_sptr nop11 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop12 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop13 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop14 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop11 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop12 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop13 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop14 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop21 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop22 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop23 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop21 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop22 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop23 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop31 = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr nop32 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop31 = gr::blocks::nop::make(sizeof(int)); + block_sptr nop32 = gr::blocks::nop::make(sizeof(int)); // Build disjoint graph #1 fg->connect(nop11, 0, nop12, 0); @@ -236,7 +236,7 @@ void qa_gr_flowgraph::t16_partition() // Build disjoint graph #3 fg->connect(nop31, 0, nop32, 0); - std::vector<gr_basic_block_vector_t> graphs = fg->partition(); + std::vector<basic_block_vector_t> graphs = fg->partition(); CPPUNIT_ASSERT(graphs.size() == 3); CPPUNIT_ASSERT(graphs[0].size() == 4); diff --git a/gr-blocks/lib/qa_gr_hier_block2.cc b/gr-blocks/lib/qa_gr_hier_block2.cc index a3d599039..bf9a167b1 100644 --- a/gr-blocks/lib/qa_gr_hier_block2.cc +++ b/gr-blocks/lib/qa_gr_hier_block2.cc @@ -25,14 +25,14 @@ #endif #include <qa_gr_hier_block2.h> -#include <gr_hier_block2.h> -#include <gr_io_signature.h> +#include <gnuradio/hier_block2.h> +#include <gnuradio/io_signature.h> -void qa_gr_hier_block2::test_make() +void qa_hier_block2::test_make() { - gr_hier_block2_sptr src1(gr_make_hier_block2("test", - gr_make_io_signature(1, 1, 1 * sizeof(int)), - gr_make_io_signature(1, 1, 1 * sizeof(int)))); + gr::hier_block2_sptr src1(gr::make_hier_block2("test", + gr::io_signature::make(1, 1, 1 * sizeof(int)), + gr::io_signature::make(1, 1, 1 * sizeof(int)))); CPPUNIT_ASSERT(src1); CPPUNIT_ASSERT_EQUAL(std::string("test"), src1->name()); diff --git a/gr-blocks/lib/qa_gr_hier_block2.h b/gr-blocks/lib/qa_gr_hier_block2.h index 653cd2725..34a77256c 100644 --- a/gr-blocks/lib/qa_gr_hier_block2.h +++ b/gr-blocks/lib/qa_gr_hier_block2.h @@ -27,9 +27,9 @@ #include <cppunit/TestCase.h> #include <stdexcept> -class qa_gr_hier_block2 : public CppUnit::TestCase +class qa_hier_block2 : public CppUnit::TestCase { - CPPUNIT_TEST_SUITE(qa_gr_hier_block2); + CPPUNIT_TEST_SUITE(qa_hier_block2); CPPUNIT_TEST(test_make); diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc index eb747d32c..1d45c8923 100644 --- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc +++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc @@ -25,12 +25,12 @@ #endif #include <qa_gr_hier_block2_derived.h> -#include <gr_top_block.h> -#include <gr_io_signature.h> -#include <blocks/null_source.h> -#include <blocks/null_sink.h> -#include <blocks/head.h> -#include <blocks/copy.h> +#include <gnuradio/top_block.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/null_source.h> +#include <gnuradio/blocks/null_sink.h> +#include <gnuradio/blocks/head.h> +#include <gnuradio/blocks/copy.h> // Declare a test C++ hierarchical block @@ -38,7 +38,7 @@ class gr_derived_block; typedef boost::shared_ptr<gr_derived_block> gr_derived_block_sptr; gr_derived_block_sptr gr_make_derived_block(); -class gr_derived_block : public gr_hier_block2 +class gr_derived_block : public gr::hier_block2 { private: friend gr_derived_block_sptr gr_make_derived_block(); @@ -56,11 +56,11 @@ gr_make_derived_block() } gr_derived_block::gr_derived_block() - : gr_hier_block2("gr_derived_block", - gr_make_io_signature(1, 1, sizeof(int)), // Input signature - gr_make_io_signature(1, 1, sizeof(int))) // Output signature + : gr::hier_block2("gr_derived_block", + gr::io_signature::make(1, 1, sizeof(int)), // Input signature + gr::io_signature::make(1, 1, sizeof(int))) // Output signature { - gr_block_sptr copy(gr::blocks::copy::make(sizeof(int))); + gr::block_sptr copy(gr::blocks::copy::make(sizeof(int))); connect(self(), 0, copy, 0); connect(copy, 0, self(), 0); @@ -70,14 +70,14 @@ gr_derived_block::~gr_derived_block() { } -void qa_gr_hier_block2_derived::test_1() +void qa_hier_block2_derived::test_1() { - gr_top_block_sptr tb(gr_make_top_block("test")); + gr::top_block_sptr tb(gr::make_top_block("test")); - gr_block_sptr src(gr::blocks::null_source::make(sizeof(int))); - gr_block_sptr head(gr::blocks::head::make(sizeof(int), 1000)); + gr::block_sptr src(gr::blocks::null_source::make(sizeof(int))); + gr::block_sptr head(gr::blocks::head::make(sizeof(int), 1000)); gr_derived_block_sptr blk(gr_make_derived_block()); - gr_block_sptr dst(gr::blocks::null_sink::make(sizeof(int))); + gr::block_sptr dst(gr::blocks::null_sink::make(sizeof(int))); tb->connect(src, 0, head, 0); tb->connect(head, 0, blk, 0); diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.h b/gr-blocks/lib/qa_gr_hier_block2_derived.h index 8e0a1880c..2c0a74356 100644 --- a/gr-blocks/lib/qa_gr_hier_block2_derived.h +++ b/gr-blocks/lib/qa_gr_hier_block2_derived.h @@ -28,9 +28,9 @@ #include <stdexcept> // Declare a QA test case -class qa_gr_hier_block2_derived : public CppUnit::TestCase +class qa_hier_block2_derived : public CppUnit::TestCase { - CPPUNIT_TEST_SUITE(qa_gr_hier_block2_derived); + CPPUNIT_TEST_SUITE(qa_hier_block2_derived); CPPUNIT_TEST(test_1); CPPUNIT_TEST_SUITE_END(); diff --git a/gr-blocks/lib/qa_gr_top_block.cc b/gr-blocks/lib/qa_gr_top_block.cc index cb75cd14d..39709d23d 100644 --- a/gr-blocks/lib/qa_gr_top_block.cc +++ b/gr-blocks/lib/qa_gr_top_block.cc @@ -25,48 +25,49 @@ #endif #include <qa_gr_top_block.h> -#include <gr_top_block.h> -#include <blocks/head.h> -#include <blocks/nop.h> -#include <blocks/null_source.h> -#include <blocks/null_sink.h> +#include <gnuradio/top_block.h> +#include <gnuradio/blocks/head.h> +#include <gnuradio/blocks/nop.h> +#include <gnuradio/blocks/null_source.h> +#include <gnuradio/blocks/null_sink.h> #include <iostream> #define VERBOSE 0 -void qa_gr_top_block::t0() +void qa_top_block::t0() { - if (VERBOSE) std::cout << "qa_gr_top_block::t0()\n"; + if (VERBOSE) std::cout << "qa_top_block::t0()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); CPPUNIT_ASSERT(tb); } -void qa_gr_top_block::t1_run() +void qa_top_block::t1_run() { - if (VERBOSE) std::cout << "qa_gr_top_block::t1()\n"; + if (VERBOSE) std::cout << "qa_top_block::t1()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); tb->connect(src, 0, head, 0); tb->connect(head, 0, dst, 0); tb->run(); } -void qa_gr_top_block::t2_start_stop_wait() +void qa_top_block::t2_start_stop_wait() { - if (VERBOSE) std::cout << "qa_gr_top_block::t2()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t2()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); tb->connect(src, 0, head, 0); tb->connect(head, 0, dst, 0); @@ -76,14 +77,15 @@ void qa_gr_top_block::t2_start_stop_wait() tb->wait(); } -void qa_gr_top_block::t3_lock_unlock() +void qa_top_block::t3_lock_unlock() { - if (VERBOSE) std::cout << "qa_gr_top_block::t3()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t3()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); tb->connect(src, 0, dst, 0); @@ -96,15 +98,16 @@ void qa_gr_top_block::t3_lock_unlock() tb->wait(); } -void qa_gr_top_block::t4_reconfigure() +void qa_top_block::t4_reconfigure() { - if (VERBOSE) std::cout << "qa_gr_top_block::t4()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t4()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); // Start infinite flowgraph tb->connect(src, 0, dst, 0); @@ -122,15 +125,16 @@ void qa_gr_top_block::t4_reconfigure() } -void qa_gr_top_block::t5_max_noutputs() +void qa_top_block::t5_max_noutputs() { - if (VERBOSE) std::cout << "qa_gr_top_block::t5()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t5()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); // Start infinite flowgraph tb->connect(src, 0, head, 0); @@ -139,15 +143,16 @@ void qa_gr_top_block::t5_max_noutputs() tb->wait(); } -void qa_gr_top_block::t6_reconfig_max_noutputs() +void qa_top_block::t6_reconfig_max_noutputs() { - if (VERBOSE) std::cout << "qa_gr_top_block::t6()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t6()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); // Start infinite flowgraph tb->connect(src, 0, dst, 0); @@ -166,15 +171,16 @@ void qa_gr_top_block::t6_reconfig_max_noutputs() tb->wait(); } -void qa_gr_top_block::t7_max_noutputs_per_block() +void qa_top_block::t7_max_noutputs_per_block() { - if (VERBOSE) std::cout << "qa_gr_top_block::t7()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t7()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); head->set_max_noutput_items(100); @@ -185,15 +191,16 @@ void qa_gr_top_block::t7_max_noutputs_per_block() tb->wait(); } -void qa_gr_top_block::t8_reconfig_max_noutputs_per_block() +void qa_top_block::t8_reconfig_max_noutputs_per_block() { - if (VERBOSE) std::cout << "qa_gr_top_block::t8()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t8()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); head->set_max_noutput_items(99); @@ -214,15 +221,16 @@ void qa_gr_top_block::t8_reconfig_max_noutputs_per_block() tb->wait(); } -void qa_gr_top_block::t9_max_output_buffer() +void qa_top_block::t9_max_output_buffer() { - if (VERBOSE) std::cout << "qa_gr_top_block::t9()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t9()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); head->set_max_output_buffer(1024); @@ -233,15 +241,16 @@ void qa_gr_top_block::t9_max_output_buffer() tb->wait(); } -void qa_gr_top_block::t10_reconfig_max_output_buffer() +void qa_top_block::t10_reconfig_max_output_buffer() { - if (VERBOSE) std::cout << "qa_gr_top_block::t10()\n"; + if(VERBOSE) + std::cout << "qa_top_block::t10()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + gr::top_block_sptr tb = gr::make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); - gr_block_sptr head = gr::blocks::head::make(sizeof(int), 100000); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + gr::block_sptr src = gr::blocks::null_source::make(sizeof(int)); + gr::block_sptr head = gr::blocks::head::make(sizeof(int), 100000); + gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); head->set_max_output_buffer(1000); @@ -251,7 +260,7 @@ void qa_gr_top_block::t10_reconfig_max_output_buffer() // Reconfigure with gr_head in the middle tb->lock(); - gr_block_sptr nop = gr::blocks::nop::make(sizeof(int)); + gr::block_sptr nop = gr::blocks::nop::make(sizeof(int)); nop->set_max_output_buffer(4000); tb->disconnect(src, 0, dst, 0); tb->connect(src, 0, head, 0); @@ -263,11 +272,11 @@ void qa_gr_top_block::t10_reconfig_max_output_buffer() tb->wait(); } -void qa_gr_top_block::t11_set_block_affinity() +void qa_top_block::t11_set_block_affinity() { - gr_top_block_sptr tb = gr_make_top_block("top"); - gr_block_sptr src (gr::blocks::null_source::make(sizeof(float))); - gr_block_sptr snk (gr::blocks::null_sink::make(sizeof(float))); + gr::top_block_sptr tb = gr::make_top_block("top"); + gr::block_sptr src (gr::blocks::null_source::make(sizeof(float))); + gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(float))); std::vector<int> set(1, 0), ret; src->set_processor_affinity(set); diff --git a/gr-blocks/lib/qa_gr_top_block.h b/gr-blocks/lib/qa_gr_top_block.h index 634eeab1f..e3ea3227e 100644 --- a/gr-blocks/lib/qa_gr_top_block.h +++ b/gr-blocks/lib/qa_gr_top_block.h @@ -27,9 +27,9 @@ #include <cppunit/TestCase.h> #include <stdexcept> -class qa_gr_top_block : public CppUnit::TestCase +class qa_top_block : public CppUnit::TestCase { - CPPUNIT_TEST_SUITE(qa_gr_top_block); + CPPUNIT_TEST_SUITE(qa_top_block); CPPUNIT_TEST(t0); CPPUNIT_TEST(t1_run); diff --git a/gr-blocks/lib/qa_rotator.cc b/gr-blocks/lib/qa_rotator.cc index 877392075..63cae39ca 100644 --- a/gr-blocks/lib/qa_rotator.cc +++ b/gr-blocks/lib/qa_rotator.cc @@ -24,13 +24,13 @@ #include <config.h> #endif -#include <attributes.h> +#include <gnuradio/attributes.h> #include <cppunit/TestAssert.h> #include <qa_rotator.h> -#include <blocks/rotator.h> +#include <gnuradio/blocks/rotator.h> #include <stdio.h> #include <cmath> -#include <gr_expj.h> +#include <gnuradio/expj.h> // error vector magnitude __GR_ATTR_UNUSED static float diff --git a/gr-blocks/lib/qa_set_msg_handler.cc b/gr-blocks/lib/qa_set_msg_handler.cc index cc94243d8..47e569878 100644 --- a/gr-blocks/lib/qa_set_msg_handler.cc +++ b/gr-blocks/lib/qa_set_msg_handler.cc @@ -25,12 +25,12 @@ #endif #include <qa_set_msg_handler.h> -#include <gr_top_block.h> -#include <blocks/head.h> -#include <blocks/null_source.h> -#include <blocks/null_sink.h> -#include <blocks/nop.h> -#include <messages/msg_passing.h> +#include <gnuradio/top_block.h> +#include <gnuradio/blocks/head.h> +#include <gnuradio/blocks/null_source.h> +#include <gnuradio/blocks/null_sink.h> +#include <gnuradio/blocks/nop.h> +#include <gnuradio/messages/msg_passing.h> #include <iostream> #include <boost/thread/thread.hpp> @@ -49,11 +49,11 @@ void qa_set_msg_handler::t0() if (VERBOSE) std::cout << "qa_set_msg_handler::t0()\n"; - gr_top_block_sptr tb = gr_make_top_block("top"); + top_block_sptr tb = make_top_block("top"); - gr_block_sptr src = gr::blocks::null_source::make(sizeof(int)); + block_sptr src = gr::blocks::null_source::make(sizeof(int)); gr::blocks::nop::sptr nop = gr::blocks::nop::make(sizeof(int)); - gr_block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); + block_sptr dst = gr::blocks::null_sink::make(sizeof(int)); tb->connect(src, 0, nop, 0); tb->connect(nop, 0, dst, 0); diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc index 0b194a053..6941beae8 100644 --- a/gr-blocks/lib/random_pdu_impl.cc +++ b/gr-blocks/lib/random_pdu_impl.cc @@ -25,8 +25,8 @@ #endif #include "random_pdu_impl.h" -#include <gr_io_signature.h> -#include <blocks/pdu.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/pdu.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } random_pdu_impl::random_pdu_impl(int min_items, int max_items) - : gr_block("random_pdu", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (0, 0, 0)), + : block("random_pdu", + io_signature::make (0, 0, 0), + io_signature::make (0, 0, 0)), d_urange(min_items, max_items), d_brange(0, 255), d_rvar(d_rng, d_urange), diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h index 3197f740a..77e7bdd52 100644 --- a/gr-blocks/lib/random_pdu_impl.h +++ b/gr-blocks/lib/random_pdu_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H #define INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H -#include <blocks/random_pdu.h> +#include <gnuradio/blocks/random_pdu.h> #include <boost/random.hpp> #include <boost/generator_iterator.hpp> diff --git a/gr-blocks/lib/regenerate_bb_impl.cc b/gr-blocks/lib/regenerate_bb_impl.cc index 4472efb6d..8b6594074 100644 --- a/gr-blocks/lib/regenerate_bb_impl.cc +++ b/gr-blocks/lib/regenerate_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "regenerate_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } regenerate_bb_impl::regenerate_bb_impl(int period, unsigned int max_regen) - : gr_sync_block("regenerate_bb", - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature(1, 1, sizeof(char))), + : sync_block("regenerate_bb", + io_signature::make(1, 1, sizeof(char)), + io_signature::make(1, 1, sizeof(char))), d_period(period), d_countdown(0), d_max_regen(max_regen), diff --git a/gr-blocks/lib/regenerate_bb_impl.h b/gr-blocks/lib/regenerate_bb_impl.h index bcfa18391..22b963c49 100644 --- a/gr-blocks/lib/regenerate_bb_impl.h +++ b/gr-blocks/lib/regenerate_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_REGENERATE_BB_H #define INCLUDED_GR_REGENERATE_BB_IMPL_H -#include <blocks/regenerate_bb.h> +#include <gnuradio/blocks/regenerate_bb.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/repack_bits_bb_impl.cc b/gr-blocks/lib/repack_bits_bb_impl.cc index c7ed054c8..af83187e9 100644 --- a/gr-blocks/lib/repack_bits_bb_impl.cc +++ b/gr-blocks/lib/repack_bits_bb_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "repack_bits_bb_impl.h" namespace gr { @@ -37,9 +37,9 @@ namespace gr { } repack_bits_bb_impl::repack_bits_bb_impl(int k, int l, const std::string &len_tag_key, bool align_output) - : gr_tagged_stream_block("repack_bits_bb", - gr_make_io_signature(1, 1, sizeof (char)), - gr_make_io_signature(1, 1, sizeof (char)), + : tagged_stream_block("repack_bits_bb", + io_signature::make(1, 1, sizeof (char)), + io_signature::make(1, 1, sizeof (char)), len_tag_key), d_k(k), d_l(l), d_packet_mode(!len_tag_key.empty()), diff --git a/gr-blocks/lib/repack_bits_bb_impl.h b/gr-blocks/lib/repack_bits_bb_impl.h index bf39f8cb0..ffb8349d3 100644 --- a/gr-blocks/lib/repack_bits_bb_impl.h +++ b/gr-blocks/lib/repack_bits_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_REPACK_BITS_BB_IMPL_H #define INCLUDED_BLOCKS_REPACK_BITS_BB_IMPL_H -#include <blocks/repack_bits_bb.h> +#include <gnuradio/blocks/repack_bits_bb.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc index 939a33b87..f77903544 100644 --- a/gr-blocks/lib/repeat_impl.cc +++ b/gr-blocks/lib/repeat_impl.cc @@ -25,7 +25,7 @@ #endif #include "repeat_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } repeat_impl::repeat_impl(size_t itemsize, int interp) - : gr_sync_interpolator("repeat", - gr_make_io_signature (1, 1, itemsize), - gr_make_io_signature (1, 1, itemsize), + : sync_interpolator("repeat", + io_signature::make (1, 1, itemsize), + io_signature::make (1, 1, itemsize), interp), d_itemsize(itemsize), d_interp(interp) diff --git a/gr-blocks/lib/repeat_impl.h b/gr-blocks/lib/repeat_impl.h index 6451d0d98..194272919 100644 --- a/gr-blocks/lib/repeat_impl.h +++ b/gr-blocks/lib/repeat_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_REPEAT_IMPL_H #define INCLUDED_REPEAT_IMPL_H -#include <blocks/repeat.h> +#include <gnuradio/blocks/repeat.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/rms_cf_impl.cc b/gr-blocks/lib/rms_cf_impl.cc index 9b2c031e1..9ef243beb 100644 --- a/gr-blocks/lib/rms_cf_impl.cc +++ b/gr-blocks/lib/rms_cf_impl.cc @@ -25,7 +25,7 @@ #endif #include "rms_cf_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cmath> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } rms_cf_impl::rms_cf_impl(double alpha) - : gr_sync_block("rms_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))) + : sync_block("rms_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))) { set_alpha(alpha); } diff --git a/gr-blocks/lib/rms_cf_impl.h b/gr-blocks/lib/rms_cf_impl.h index 316ab2f30..66ee12463 100644 --- a/gr-blocks/lib/rms_cf_impl.h +++ b/gr-blocks/lib/rms_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_RMS_CF_IMPL_H #define INCLUDED_BLOCKS_RMS_CF_IMPL_H -#include <blocks/rms_cf.h> +#include <gnuradio/blocks/rms_cf.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/rms_ff_impl.cc b/gr-blocks/lib/rms_ff_impl.cc index 8e004ad61..c84193c9f 100644 --- a/gr-blocks/lib/rms_ff_impl.cc +++ b/gr-blocks/lib/rms_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "rms_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cmath> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } rms_ff_impl::rms_ff_impl(double alpha) - : gr_sync_block("rms_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))) + : sync_block("rms_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))) { set_alpha(alpha); } diff --git a/gr-blocks/lib/rms_ff_impl.h b/gr-blocks/lib/rms_ff_impl.h index 34d7d986c..49ef1e07b 100644 --- a/gr-blocks/lib/rms_ff_impl.h +++ b/gr-blocks/lib/rms_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_RMS_FF_IMPL_H #define INCLUDED_BLOCKS_RMS_FF_IMPL_H -#include <blocks/rms_ff.h> +#include <gnuradio/blocks/rms_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/sample_and_hold_XX_impl.cc.t b/gr-blocks/lib/sample_and_hold_XX_impl.cc.t index 617b2d6ee..27597b67d 100644 --- a/gr-blocks/lib/sample_and_hold_XX_impl.cc.t +++ b/gr-blocks/lib/sample_and_hold_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -40,9 +40,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@() - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature2(2, 2, sizeof(@I_TYPE@), sizeof(char)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make2(2, 2, sizeof(@I_TYPE@), sizeof(char)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_data(0) { } diff --git a/gr-blocks/lib/sample_and_hold_XX_impl.h.t b/gr-blocks/lib/sample_and_hold_XX_impl.h.t index 048bf0d0e..ed7d6f4d4 100644 --- a/gr-blocks/lib/sample_and_hold_XX_impl.h.t +++ b/gr-blocks/lib/sample_and_hold_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/short_to_char_impl.cc b/gr-blocks/lib/short_to_char_impl.cc index 54875a2b3..f4a5c80c3 100644 --- a/gr-blocks/lib/short_to_char_impl.cc +++ b/gr-blocks/lib/short_to_char_impl.cc @@ -25,7 +25,7 @@ #endif #include "short_to_char_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } short_to_char_impl::short_to_char_impl(size_t vlen) - : gr_sync_block("short_to_char", - gr_make_io_signature (1, 1, sizeof(short)*vlen), - gr_make_io_signature (1, 1, sizeof(char)*vlen)), + : sync_block("short_to_char", + io_signature::make (1, 1, sizeof(short)*vlen), + io_signature::make (1, 1, sizeof(char)*vlen)), d_vlen(vlen) { const int alignment_multiple = diff --git a/gr-blocks/lib/short_to_char_impl.h b/gr-blocks/lib/short_to_char_impl.h index 37474094d..491d9bb25 100644 --- a/gr-blocks/lib/short_to_char_impl.h +++ b/gr-blocks/lib/short_to_char_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_SHORT_TO_CHAR_IMPL_H #define INCLUDED_SHORT_TO_CHAR_IMPL_H -#include <blocks/short_to_char.h> +#include <gnuradio/blocks/short_to_char.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/short_to_float_impl.cc b/gr-blocks/lib/short_to_float_impl.cc index 618601816..147b0c07f 100644 --- a/gr-blocks/lib/short_to_float_impl.cc +++ b/gr-blocks/lib/short_to_float_impl.cc @@ -25,7 +25,7 @@ #endif #include "short_to_float_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } short_to_float_impl::short_to_float_impl(size_t vlen, float scale) - : gr_sync_block("short_to_float", - gr_make_io_signature (1, 1, sizeof(short)*vlen), - gr_make_io_signature (1, 1, sizeof(float)*vlen)), + : sync_block("short_to_float", + io_signature::make (1, 1, sizeof(short)*vlen), + io_signature::make (1, 1, sizeof(float)*vlen)), d_vlen(vlen), d_scale(scale) { const int alignment_multiple = diff --git a/gr-blocks/lib/short_to_float_impl.h b/gr-blocks/lib/short_to_float_impl.h index c36b42a8c..1b34a4f42 100644 --- a/gr-blocks/lib/short_to_float_impl.h +++ b/gr-blocks/lib/short_to_float_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_SHORT_TO_FLOAT_IMPL_H #define INCLUDED_SHORT_TO_FLOAT_IMPL_H -#include <blocks/short_to_float.h> +#include <gnuradio/blocks/short_to_float.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/skiphead_impl.cc b/gr-blocks/lib/skiphead_impl.cc index feb39eb8f..da9cb1128 100644 --- a/gr-blocks/lib/skiphead_impl.cc +++ b/gr-blocks/lib/skiphead_impl.cc @@ -25,7 +25,7 @@ #endif #include "skiphead_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } skiphead_impl::skiphead_impl(size_t itemsize, uint64_t nitems_to_skip) - : gr_block("skiphead", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(1, 1, itemsize)), + : block("skiphead", + io_signature::make(1, 1, itemsize), + io_signature::make(1, 1, itemsize)), d_nitems_to_skip(nitems_to_skip), d_nitems(0) { } diff --git a/gr-blocks/lib/skiphead_impl.h b/gr-blocks/lib/skiphead_impl.h index d8e0870cb..db4df50ad 100644 --- a/gr-blocks/lib/skiphead_impl.h +++ b/gr-blocks/lib/skiphead_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_SKIPHEAD_IMPL_H #define INCLUDED_GR_SKIPHEAD_IMPL_H -#include <blocks/skiphead.h> +#include <gnuradio/blocks/skiphead.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc index e4ef40f87..9daf8c30c 100644 --- a/gr-blocks/lib/socket_pdu_impl.cc +++ b/gr-blocks/lib/socket_pdu_impl.cc @@ -26,8 +26,8 @@ #include "socket_pdu_impl.h" #include "tcp_connection.h" -#include <gr_io_signature.h> -#include <blocks/pdu.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/pdu.h> namespace gr { namespace blocks { @@ -39,9 +39,9 @@ namespace gr { } socket_pdu_impl::socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU) - : gr_block("socket_pdu", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (0, 0, 0)) + : block("socket_pdu", + io_signature::make (0, 0, 0), + io_signature::make (0, 0, 0)) { message_port_register_in(PDU_PORT_ID); message_port_register_out(PDU_PORT_ID); diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h index 78602754c..3099d90e0 100644 --- a/gr-blocks/lib/socket_pdu_impl.h +++ b/gr-blocks/lib/socket_pdu_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H #define INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H -#include <blocks/socket_pdu.h> +#include <gnuradio/blocks/socket_pdu.h> #include "stream_pdu_base.h" #include "tcp_connection.h" diff --git a/gr-blocks/lib/stream_mux_impl.cc b/gr-blocks/lib/stream_mux_impl.cc index 214734c4b..1e42c2504 100644 --- a/gr-blocks/lib/stream_mux_impl.cc +++ b/gr-blocks/lib/stream_mux_impl.cc @@ -25,7 +25,7 @@ #endif #include "stream_mux_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <cstdio> @@ -40,9 +40,9 @@ namespace gr { } stream_mux_impl::stream_mux_impl(size_t itemsize, const std::vector<int> &lengths) - : gr_block("stream_mux", - gr_make_io_signature (1, -1, itemsize), - gr_make_io_signature (1, 1, itemsize)), + : block("stream_mux", + io_signature::make (1, -1, itemsize), + io_signature::make (1, 1, itemsize)), d_itemsize(itemsize), d_stream(0), d_residual(0), diff --git a/gr-blocks/lib/stream_mux_impl.h b/gr-blocks/lib/stream_mux_impl.h index 7b2dac95c..328eb0710 100644 --- a/gr-blocks/lib/stream_mux_impl.h +++ b/gr-blocks/lib/stream_mux_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_STREAM_MUX_IMPL_H #define INCLUDED_STREAM_MUX_IMPL_H -#include <blocks/stream_mux.h> +#include <gnuradio/blocks/stream_mux.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/stream_pdu_base.cc b/gr-blocks/lib/stream_pdu_base.cc index c887ad2fa..a07fa8695 100644 --- a/gr-blocks/lib/stream_pdu_base.cc +++ b/gr-blocks/lib/stream_pdu_base.cc @@ -32,8 +32,8 @@ #include <winsock2.h> #endif -#include <blocks/pdu.h> -#include <gr_basic_block.h> +#include <gnuradio/blocks/pdu.h> +#include <gnuradio/basic_block.h> #include "stream_pdu_base.h" #include <boost/format.hpp> @@ -57,7 +57,7 @@ namespace gr { } void - stream_pdu_base::start_rxthread(gr_basic_block *blk, pmt::pmt_t port) + stream_pdu_base::start_rxthread(basic_block *blk, pmt::pmt_t port) { d_blk = blk; d_port = port; diff --git a/gr-blocks/lib/stream_pdu_base.h b/gr-blocks/lib/stream_pdu_base.h index c305880b0..cd976eed4 100644 --- a/gr-blocks/lib/stream_pdu_base.h +++ b/gr-blocks/lib/stream_pdu_base.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_STREAM_PDU_BASE_H #define INCLUDED_STREAM_PDU_BASE_H -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> #include <pmt/pmt.h> -class gr_basic_block; +class basic_block; namespace gr { namespace blocks { @@ -45,12 +45,12 @@ namespace gr { gr::thread::thread d_thread; pmt::pmt_t d_port; - gr_basic_block *d_blk; + basic_block *d_blk; void run(); void send(pmt::pmt_t msg); bool wait_ready(); - void start_rxthread(gr_basic_block *blk, pmt::pmt_t rxport); + void start_rxthread(basic_block *blk, pmt::pmt_t rxport); void stop_rxthread(); }; diff --git a/gr-blocks/lib/stream_to_streams_impl.cc b/gr-blocks/lib/stream_to_streams_impl.cc index 9e9052e7d..76974ce0a 100644 --- a/gr-blocks/lib/stream_to_streams_impl.cc +++ b/gr-blocks/lib/stream_to_streams_impl.cc @@ -25,29 +25,31 @@ #endif #include "stream_to_streams_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { namespace blocks { - stream_to_streams::sptr stream_to_streams::make(size_t itemsize, size_t nstreams) + stream_to_streams::sptr + stream_to_streams::make(size_t itemsize, size_t nstreams) { - return gnuradio::get_initial_sptr(new stream_to_streams_impl(itemsize, nstreams)); + return gnuradio::get_initial_sptr + (new stream_to_streams_impl(itemsize, nstreams)); } stream_to_streams_impl::stream_to_streams_impl(size_t itemsize, size_t nstreams) - : gr_sync_decimator("stream_to_streams", - gr_make_io_signature (1, 1, itemsize), - gr_make_io_signature (nstreams, nstreams, itemsize), - nstreams) + : sync_decimator("stream_to_streams", + io_signature::make(1, 1, itemsize), + io_signature::make(nstreams, nstreams, itemsize), + nstreams) { } int stream_to_streams_impl::work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) { size_t item_size = output_signature()->sizeof_stream_item(0); diff --git a/gr-blocks/lib/stream_to_streams_impl.h b/gr-blocks/lib/stream_to_streams_impl.h index 9a96983ff..bd3763572 100644 --- a/gr-blocks/lib/stream_to_streams_impl.h +++ b/gr-blocks/lib/stream_to_streams_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_STREAM_TO_STREAMS_IMPL_H #define INCLUDED_STREAM_TO_STREAMS_IMPL_H -#include <blocks/stream_to_streams.h> +#include <gnuradio/blocks/stream_to_streams.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/stream_to_vector_impl.cc b/gr-blocks/lib/stream_to_vector_impl.cc index 80ced5a74..8576c7fbf 100644 --- a/gr-blocks/lib/stream_to_vector_impl.cc +++ b/gr-blocks/lib/stream_to_vector_impl.cc @@ -25,7 +25,7 @@ #endif #include "stream_to_vector_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } stream_to_vector_impl::stream_to_vector_impl(size_t itemsize, size_t nitems_per_block) - : gr_sync_decimator ("stream_to_vector", - gr_make_io_signature (1, 1, itemsize), - gr_make_io_signature (1, 1, itemsize * nitems_per_block), + : sync_decimator ("stream_to_vector", + io_signature::make (1, 1, itemsize), + io_signature::make (1, 1, itemsize * nitems_per_block), nitems_per_block) { } diff --git a/gr-blocks/lib/stream_to_vector_impl.h b/gr-blocks/lib/stream_to_vector_impl.h index f8031f005..3484d397e 100644 --- a/gr-blocks/lib/stream_to_vector_impl.h +++ b/gr-blocks/lib/stream_to_vector_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_STREAM_TO_VECTOR_IMPL_H #define INCLUDED_STREAM_TO_VECTOR_IMPL_H -#include <blocks/stream_to_vector.h> +#include <gnuradio/blocks/stream_to_vector.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/streams_to_stream_impl.cc b/gr-blocks/lib/streams_to_stream_impl.cc index 09c593e81..8d2f33044 100644 --- a/gr-blocks/lib/streams_to_stream_impl.cc +++ b/gr-blocks/lib/streams_to_stream_impl.cc @@ -25,7 +25,7 @@ #endif #include "streams_to_stream_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } streams_to_stream_impl::streams_to_stream_impl(size_t itemsize, size_t nstreams) - : gr_sync_interpolator ("streams_to_stream", - gr_make_io_signature (nstreams, nstreams, itemsize), - gr_make_io_signature (1, 1, itemsize), + : sync_interpolator ("streams_to_stream", + io_signature::make (nstreams, nstreams, itemsize), + io_signature::make (1, 1, itemsize), nstreams) { } diff --git a/gr-blocks/lib/streams_to_stream_impl.h b/gr-blocks/lib/streams_to_stream_impl.h index 6f686172c..e3ffde504 100644 --- a/gr-blocks/lib/streams_to_stream_impl.h +++ b/gr-blocks/lib/streams_to_stream_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_STREAMS_TO_STREAM_IMPL_H #define INCLUDED_STREAMS_TO_STREAM_IMPL_H -#include <blocks/streams_to_stream.h> +#include <gnuradio/blocks/streams_to_stream.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/streams_to_vector_impl.cc b/gr-blocks/lib/streams_to_vector_impl.cc index c524a78e4..a65e11b57 100644 --- a/gr-blocks/lib/streams_to_vector_impl.cc +++ b/gr-blocks/lib/streams_to_vector_impl.cc @@ -25,7 +25,7 @@ #endif #include "streams_to_vector_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } streams_to_vector_impl::streams_to_vector_impl(size_t itemsize, size_t nstreams) - : gr_sync_block ("streams_to_vector", - gr_make_io_signature (nstreams, nstreams, itemsize), - gr_make_io_signature (1, 1, nstreams * itemsize)) + : sync_block ("streams_to_vector", + io_signature::make (nstreams, nstreams, itemsize), + io_signature::make (1, 1, nstreams * itemsize)) { } diff --git a/gr-blocks/lib/streams_to_vector_impl.h b/gr-blocks/lib/streams_to_vector_impl.h index 4a14e9d4f..5590e416b 100644 --- a/gr-blocks/lib/streams_to_vector_impl.h +++ b/gr-blocks/lib/streams_to_vector_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_STREAMS_TO_VECTOR_IMPL_H #define INCLUDED_STREAMS_TO_VECTOR_IMPL_H -#include <blocks/streams_to_vector.h> +#include <gnuradio/blocks/streams_to_vector.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/stretch_ff_impl.cc b/gr-blocks/lib/stretch_ff_impl.cc index 90bbc7ee5..4d43d13d6 100644 --- a/gr-blocks/lib/stretch_ff_impl.cc +++ b/gr-blocks/lib/stretch_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "stretch_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } stretch_ff_impl::stretch_ff_impl(float lo, size_t vlen) - : gr_sync_block("stretch_ff", - gr_make_io_signature(1, 1, vlen * sizeof(float)), - gr_make_io_signature(1, 1, vlen * sizeof(float))), + : sync_block("stretch_ff", + io_signature::make(1, 1, vlen * sizeof(float)), + io_signature::make(1, 1, vlen * sizeof(float))), d_lo(lo), d_vlen(vlen) { } diff --git a/gr-blocks/lib/stretch_ff_impl.h b/gr-blocks/lib/stretch_ff_impl.h index af69d835a..b44de8031 100644 --- a/gr-blocks/lib/stretch_ff_impl.h +++ b/gr-blocks/lib/stretch_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_STRETCH_FF_IMPL_H #define INCLUDED_GR_STRETCH_FF_IMPL_H -#include <blocks/stretch_ff.h> +#include <gnuradio/blocks/stretch_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/sub_XX_impl.cc.t b/gr-blocks/lib/sub_XX_impl.cc.t index 35ae31452..d0fa16749 100644 --- a/gr-blocks/lib/sub_XX_impl.cc.t +++ b/gr-blocks/lib/sub_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/sub_XX_impl.h.t b/gr-blocks/lib/sub_XX_impl.h.t index a1c486b85..2680ef701 100644 --- a/gr-blocks/lib/sub_XX_impl.h.t +++ b/gr-blocks/lib/sub_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc index 3bcffb664..56f701b9d 100644 --- a/gr-blocks/lib/tag_debug_impl.cc +++ b/gr-blocks/lib/tag_debug_impl.cc @@ -25,7 +25,7 @@ #endif #include "tag_debug_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> #include <iomanip> @@ -42,9 +42,9 @@ namespace gr { tag_debug_impl::tag_debug_impl(size_t sizeof_stream_item, const std::string &name) - : gr_sync_block("tag_debug", - gr_make_io_signature(1, -1, sizeof_stream_item), - gr_make_io_signature(0, 0, 0)), + : sync_block("tag_debug", + io_signature::make(1, -1, sizeof_stream_item), + io_signature::make(0, 0, 0)), d_name(name), d_display(true) { } @@ -53,7 +53,7 @@ namespace gr { { } - std::vector<gr_tag_t> + std::vector<tag_t> tag_debug_impl::current_tags() { gr::thread::scoped_lock l(d_mutex); diff --git a/gr-blocks/lib/tag_debug_impl.h b/gr-blocks/lib/tag_debug_impl.h index caf5b6b4f..80d714edc 100644 --- a/gr-blocks/lib/tag_debug_impl.h +++ b/gr-blocks/lib/tag_debug_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_TAG_DEBUG_IMPL_H #define INCLUDED_GR_TAG_DEBUG_IMPL_H -#include <blocks/tag_debug.h> -#include <thread/thread.h> +#include <gnuradio/blocks/tag_debug.h> +#include <gnuradio/thread/thread.h> #include <stddef.h> namespace gr { @@ -34,8 +34,8 @@ namespace gr { { private: std::string d_name; - std::vector<gr_tag_t> d_tags; - std::vector<gr_tag_t>::iterator d_tags_itr; + std::vector<tag_t> d_tags; + std::vector<tag_t>::iterator d_tags_itr; bool d_display; gr::thread::mutex d_mutex; @@ -43,7 +43,7 @@ namespace gr { tag_debug_impl(size_t sizeof_stream_item, const std::string &name); ~tag_debug_impl(); - std::vector<gr_tag_t> current_tags(); + std::vector<tag_t> current_tags(); void set_display(bool d); diff --git a/gr-blocks/lib/tag_gate_impl.cc b/gr-blocks/lib/tag_gate_impl.cc new file mode 100644 index 000000000..643ec6748 --- /dev/null +++ b/gr-blocks/lib/tag_gate_impl.cc @@ -0,0 +1,79 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gnuradio/io_signature.h> +#include "tag_gate_impl.h" + +namespace gr { + namespace blocks { + + tag_gate::sptr + tag_gate::make(size_t item_size, bool propagate_tags) + { + return gnuradio::get_initial_sptr (new tag_gate_impl(item_size, propagate_tags)); + } + + tag_gate_impl::tag_gate_impl(size_t item_size, bool propagate_tags) + : gr::sync_block("tag_gate", + gr::io_signature::make(1, 1, item_size), + gr::io_signature::make(1, 1, item_size)), + d_item_size(item_size), + d_propagate_tags(propagate_tags) + { + if (!d_propagate_tags) { + set_tag_propagation_policy(TPP_DONT); + } + } + + tag_gate_impl::~tag_gate_impl() + { + } + + void tag_gate_impl::set_propagation(bool propagate_tags) + { + if (propagate_tags) { + set_tag_propagation_policy(TPP_ALL_TO_ALL); + } else { + set_tag_propagation_policy(TPP_DONT); + } + } + + int + tag_gate_impl::work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) + { + const unsigned char *in = (const unsigned char *) input_items[0]; + unsigned char *out = (unsigned char *) output_items[0]; + + memcpy((void *) out, (void *) in, d_item_size * noutput_items); + + return noutput_items; + } + + } /* namespace blocks */ +} /* namespace gr */ + diff --git a/gr-blocks/lib/tag_gate_impl.h b/gr-blocks/lib/tag_gate_impl.h new file mode 100644 index 000000000..4983ba10b --- /dev/null +++ b/gr-blocks/lib/tag_gate_impl.h @@ -0,0 +1,52 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_BLOCKS_TAG_GATE_IMPL_H +#define INCLUDED_BLOCKS_TAG_GATE_IMPL_H + +#include <gnuradio/blocks/tag_gate.h> + +namespace gr { + namespace blocks { + + class tag_gate_impl : public tag_gate + { + private: + size_t d_item_size; + bool d_propagate_tags; + + public: + tag_gate_impl(size_t item_size, bool propagate_tags); + ~tag_gate_impl(); + + void set_propagation(bool propagate_tags); + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); + }; + + } // namespace blocks +} // namespace gr + +#endif /* INCLUDED_BLOCKS_TAG_GATE_IMPL_H */ + diff --git a/gr-blocks/lib/tagged_file_sink_impl.cc b/gr-blocks/lib/tagged_file_sink_impl.cc index 7d011e45f..830791181 100644 --- a/gr-blocks/lib/tagged_file_sink_impl.cc +++ b/gr-blocks/lib/tagged_file_sink_impl.cc @@ -25,7 +25,7 @@ #endif #include "tagged_file_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> @@ -61,9 +61,9 @@ namespace gr { } tagged_file_sink_impl::tagged_file_sink_impl(size_t itemsize, double samp_rate) - : gr_sync_block("tagged_file_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("tagged_file_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize (itemsize), d_n(0), d_sample_rate(samp_rate) { d_state = NOT_IN_BURST; @@ -87,18 +87,18 @@ namespace gr { pmt::pmt_t bkey = pmt::string_to_symbol("burst"); pmt::pmt_t tkey = pmt::string_to_symbol("rx_time"); // use gr_tags::key_time - std::vector<gr_tag_t> all_tags; + std::vector<tag_t> all_tags; get_tags_in_range(all_tags, 0, start_N, end_N); - std::sort(all_tags.begin(), all_tags.end(), gr_tag_t::offset_compare); + std::sort(all_tags.begin(), all_tags.end(), tag_t::offset_compare); - std::vector<gr_tag_t>::iterator vitr = all_tags.begin(); + std::vector<tag_t>::iterator vitr = all_tags.begin(); // Look for a time tag and initialize d_timeval. - std::vector<gr_tag_t> time_tags_outer; + std::vector<tag_t> time_tags_outer; get_tags_in_range(time_tags_outer, 0, start_N, end_N, tkey); if(time_tags_outer.size() > 0) { - const gr_tag_t tag = time_tags_outer[0]; + const tag_t tag = time_tags_outer[0]; uint64_t offset = tag.offset; pmt::pmt_t time = tag.value; uint64_t tsecs = pmt::to_uint64(pmt::tuple_ref(time, 0)); @@ -123,11 +123,11 @@ namespace gr { // Find time burst occurred by getting latest time tag and extrapolating // to new time based on sample rate of this block. - std::vector<gr_tag_t> time_tags; + std::vector<tag_t> time_tags; //get_tags_in_range(time_tags, 0, d_last_N, N, gr_tags::key_time); get_tags_in_range(time_tags, 0, d_last_N, N, tkey); if(time_tags.size() > 0) { - const gr_tag_t tag = time_tags[time_tags.size()-1]; + const tag_t tag = time_tags[time_tags.size()-1]; uint64_t time_nitems = tag.offset; diff --git a/gr-blocks/lib/tagged_file_sink_impl.h b/gr-blocks/lib/tagged_file_sink_impl.h index f64cedf2f..7b1d43e64 100644 --- a/gr-blocks/lib/tagged_file_sink_impl.h +++ b/gr-blocks/lib/tagged_file_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_TAGGED_FILE_SINK_IMPL_H #define INCLUDED_GR_TAGGED_FILE_SINK_IMPL_H -#include <blocks/tagged_file_sink.h> +#include <gnuradio/blocks/tagged_file_sink.h> #include <cstdio> // for FILE namespace gr { diff --git a/gr-blocks/lib/tagged_stream_mux_impl.cc b/gr-blocks/lib/tagged_stream_mux_impl.cc index 59e36fa07..78b573016 100644 --- a/gr-blocks/lib/tagged_stream_mux_impl.cc +++ b/gr-blocks/lib/tagged_stream_mux_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "tagged_stream_mux_impl.h" namespace gr { @@ -37,9 +37,9 @@ namespace gr { } tagged_stream_mux_impl::tagged_stream_mux_impl(size_t itemsize, const std::string &lengthtagname) - : gr_tagged_stream_block("tagged_stream_mux", - gr_make_io_signature(1, -1, itemsize), - gr_make_io_signature(1, 1, itemsize), + : tagged_stream_block("tagged_stream_mux", + io_signature::make(1, -1, itemsize), + io_signature::make(1, 1, itemsize), lengthtagname), d_itemsize(itemsize) { @@ -74,7 +74,7 @@ namespace gr { for (unsigned int i = 0; i < input_items.size(); i++) { const unsigned char *in = (const unsigned char *) input_items[i]; - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; get_tags_in_range(tags, i, nitems_read(i), nitems_read(i)+ninput_items[i]); for (unsigned int j = 0; j < tags.size(); j++) { const uint64_t offset = tags[j].offset - nitems_read(i) + nitems_written(0) + n_produced; diff --git a/gr-blocks/lib/tagged_stream_mux_impl.h b/gr-blocks/lib/tagged_stream_mux_impl.h index 19862e686..dd7eaf635 100644 --- a/gr-blocks/lib/tagged_stream_mux_impl.h +++ b/gr-blocks/lib/tagged_stream_mux_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_TAGGED_STREAM_MUX_IMPL_H #include <vector> -#include <blocks/tagged_stream_mux.h> +#include <gnuradio/blocks/tagged_stream_mux.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc index 4abc5818b..b452470ef 100644 --- a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc +++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc @@ -25,8 +25,8 @@ #endif #include "tagged_stream_to_pdu_impl.h" -#include <blocks/pdu.h> -#include <gr_io_signature.h> +#include <gnuradio/blocks/pdu.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } tagged_stream_to_pdu_impl::tagged_stream_to_pdu_impl(pdu::vector_type type) - : gr_sync_block("tagged_stream_to_pdu", - gr_make_io_signature(1, 1, pdu::itemsize(type)), - gr_make_io_signature(0, 0, 0)), + : sync_block("tagged_stream_to_pdu", + io_signature::make(1, 1, pdu::itemsize(type)), + io_signature::make(0, 0, 0)), d_itemsize(pdu::itemsize(type)), d_inpdu(false), d_type(type), diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.h b/gr-blocks/lib/tagged_stream_to_pdu_impl.h index 84d7f6c3c..4e9568a1c 100644 --- a/gr-blocks/lib/tagged_stream_to_pdu_impl.h +++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TAGGED_STREAM_TO_PDU_IMPL_H #define INCLUDED_TAGGED_STREAM_TO_PDU_IMPL_H -#include <blocks/tagged_stream_to_pdu.h> +#include <gnuradio/blocks/tagged_stream_to_pdu.h> namespace gr { namespace blocks { @@ -39,8 +39,8 @@ namespace gr { pmt::pmt_t d_pdu_meta; pmt::pmt_t d_pdu_vector; - std::vector<gr_tag_t>::iterator d_tags_itr; - std::vector<gr_tag_t> d_tags; + std::vector<tag_t>::iterator d_tags_itr; + std::vector<tag_t> d_tags; public: tagged_stream_to_pdu_impl(pdu::vector_type type); diff --git a/gr-blocks/lib/tcp_connection.cc b/gr-blocks/lib/tcp_connection.cc index 33bb6f10f..ce719d184 100644 --- a/gr-blocks/lib/tcp_connection.cc +++ b/gr-blocks/lib/tcp_connection.cc @@ -25,8 +25,8 @@ #endif #include "tcp_connection.h" -#include <gr_basic_block.h> -#include <blocks/pdu.h> +#include <gnuradio/basic_block.h> +#include <gnuradio/blocks/pdu.h> namespace gr { namespace blocks { @@ -55,7 +55,7 @@ namespace gr { } void - tcp_connection::start(gr_basic_block *block) + tcp_connection::start(gr::basic_block *block) { d_block = block; d_socket.async_read_some(boost::asio::buffer(d_buf), diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h index 32a5ef8c7..f4d32fa90 100644 --- a/gr-blocks/lib/tcp_connection.h +++ b/gr-blocks/lib/tcp_connection.h @@ -27,9 +27,10 @@ #include <boost/asio.hpp> #include <pmt/pmt.h> -class gr_basic_block; - namespace gr { + + class basic_block; + namespace blocks { class tcp_connection @@ -38,7 +39,7 @@ namespace gr { boost::asio::ip::tcp::socket d_socket; boost::array<char, 10000> d_buf; std::string d_message; - gr_basic_block *d_block; + basic_block *d_block; tcp_connection(boost::asio::io_service& io_service); @@ -49,7 +50,7 @@ namespace gr { boost::asio::ip::tcp::socket& socket() { return d_socket; }; - void start(gr_basic_block *block); + void start(gr::basic_block *block); void send(pmt::pmt_t vector); void handle_read(const boost::system::error_code& error, size_t bytes_transferred); void handle_write(const boost::system::error_code& error, size_t bytes_transferred) { } diff --git a/gr-blocks/lib/test_gr_blocks.cc b/gr-blocks/lib/test_gr_blocks.cc index 14f047fb7..2d8f0d6d2 100644 --- a/gr-blocks/lib/test_gr_blocks.cc +++ b/gr-blocks/lib/test_gr_blocks.cc @@ -27,7 +27,7 @@ #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> -#include <gr_unittests.h> +#include <gnuradio/unittests.h> #include <qa_blocks.h> #include <iostream> @@ -35,10 +35,10 @@ int main(int argc, char **argv) { CppUnit::TextTestRunner runner; - std::ofstream xmlfile(get_unittest_path("gr_blocks.xml").c_str()); + std::ofstream xmlfile(get_unittest_path("blocks.xml").c_str()); CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); - runner.addTest(qa_gr_blocks::suite()); + runner.addTest(qa_blocks::suite()); runner.setOutputter(xmlout); bool was_successful = runner.run("", false); diff --git a/gr-blocks/lib/threshold_ff_impl.cc b/gr-blocks/lib/threshold_ff_impl.cc index 477f2b1c8..86432de11 100644 --- a/gr-blocks/lib/threshold_ff_impl.cc +++ b/gr-blocks/lib/threshold_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "threshold_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -39,9 +39,9 @@ namespace gr { threshold_ff_impl::threshold_ff_impl(float lo, float hi, float initial_state) - : gr_sync_block("threshold_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("threshold_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), d_lo(lo), d_hi(hi), d_last_state(initial_state) { } diff --git a/gr-blocks/lib/threshold_ff_impl.h b/gr-blocks/lib/threshold_ff_impl.h index 41afaa52a..13d71c433 100644 --- a/gr-blocks/lib/threshold_ff_impl.h +++ b/gr-blocks/lib/threshold_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_THRESHOLD_FF_IMPL_H #define INCLUDED_GR_THRESHOLD_FF_IMPL_H -#include <blocks/threshold_ff.h> +#include <gnuradio/blocks/threshold_ff.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/throttle_impl.cc b/gr-blocks/lib/throttle_impl.cc index b1cfe4b3c..42f3665c8 100644 --- a/gr-blocks/lib/throttle_impl.cc +++ b/gr-blocks/lib/throttle_impl.cc @@ -25,7 +25,7 @@ #endif #include "throttle_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstring> #include <boost/thread/thread.hpp> @@ -41,9 +41,9 @@ namespace gr { throttle_impl::throttle_impl(size_t itemsize, double samples_per_second) - : gr_sync_block("throttle", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(1, 1, itemsize)), + : sync_block("throttle", + io_signature::make(1, 1, itemsize), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize) { set_sample_rate(samples_per_second); diff --git a/gr-blocks/lib/throttle_impl.h b/gr-blocks/lib/throttle_impl.h index 2f2cdf108..797cb7d94 100644 --- a/gr-blocks/lib/throttle_impl.h +++ b/gr-blocks/lib/throttle_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_THROTTLE_IMPL_H #define INCLUDED_GR_THROTTLE_IMPL_H -#include <blocks/throttle.h> +#include <gnuradio/blocks/throttle.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/transcendental_impl.cc b/gr-blocks/lib/transcendental_impl.cc index 725899ca8..d9a635fdc 100644 --- a/gr-blocks/lib/transcendental_impl.cc +++ b/gr-blocks/lib/transcendental_impl.cc @@ -21,7 +21,7 @@ */ #include "transcendental_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <complex> //complex math #include <cmath> //real math @@ -126,9 +126,9 @@ namespace gr { transcendental_impl::transcendental_impl(const work_fcn_type &work_fcn, const size_t io_size) - : gr_sync_block("transcendental", - gr_make_io_signature(1, 1, io_size), - gr_make_io_signature(1, 1, io_size)), + : sync_block("transcendental", + io_signature::make(1, 1, io_size), + io_signature::make(1, 1, io_size)), _work_fcn(work_fcn) { // NOP diff --git a/gr-blocks/lib/transcendental_impl.h b/gr-blocks/lib/transcendental_impl.h index 47055551e..bb82b23b6 100644 --- a/gr-blocks/lib/transcendental_impl.h +++ b/gr-blocks/lib/transcendental_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_TRANSCENDENTAL_IMPL_H #define INCLUDED_GR_TRANSCENDENTAL_IMPL_H -#include <blocks/transcendental.h> +#include <gnuradio/blocks/transcendental.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc index 8de817738..0e2b63fab 100644 --- a/gr-blocks/lib/tuntap_pdu_impl.cc +++ b/gr-blocks/lib/tuntap_pdu_impl.cc @@ -25,8 +25,8 @@ #endif #include "tuntap_pdu_impl.h" -#include <gr_io_signature.h> -#include <blocks/pdu.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/pdu.h> #include <boost/format.hpp> #include <sys/types.h> @@ -54,9 +54,9 @@ namespace gr { #if (defined(linux) || defined(__linux) || defined(__linux__)) tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU) - : gr_block("tuntap_pdu", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (0, 0, 0)), + : block("tuntap_pdu", + io_signature::make (0, 0, 0), + io_signature::make (0, 0, 0)), stream_pdu_base(MTU), d_dev(dev) { diff --git a/gr-blocks/lib/tuntap_pdu_impl.h b/gr-blocks/lib/tuntap_pdu_impl.h index 396d9d51c..41e4587ac 100644 --- a/gr-blocks/lib/tuntap_pdu_impl.h +++ b/gr-blocks/lib/tuntap_pdu_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H #define INCLUDED_BLOCKS_TUNTAP_PDU_IMPL_H -#include <blocks/tuntap_pdu.h> +#include <gnuradio/blocks/tuntap_pdu.h> #include "stream_pdu_base.h" #if (defined(linux) || defined(__linux) || defined(__linux__)) diff --git a/gr-blocks/lib/uchar_array_to_float.h b/gr-blocks/lib/uchar_array_to_float.h index e6772c2a8..9b499760a 100644 --- a/gr-blocks/lib/uchar_array_to_float.h +++ b/gr-blocks/lib/uchar_array_to_float.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_UCHAR_ARRAY_TO_FLOAT_H #define INCLUDED_UCHAR_ARRAY_TO_FLOAT_H -#include <blocks/api.h> +#include <gnuradio/blocks/api.h> /* * convert array of unsigned chars to floats diff --git a/gr-blocks/lib/uchar_to_float_impl.cc b/gr-blocks/lib/uchar_to_float_impl.cc index 608c05ad4..20887881d 100644 --- a/gr-blocks/lib/uchar_to_float_impl.cc +++ b/gr-blocks/lib/uchar_to_float_impl.cc @@ -26,7 +26,7 @@ #include "uchar_to_float_impl.h" #include "uchar_array_to_float.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -37,9 +37,9 @@ namespace gr { } uchar_to_float_impl::uchar_to_float_impl() - : gr_sync_block("uchar_to_float", - gr_make_io_signature (1, 1, sizeof(unsigned char)), - gr_make_io_signature (1, 1, sizeof(float))) + : sync_block("uchar_to_float", + io_signature::make (1, 1, sizeof(unsigned char)), + io_signature::make (1, 1, sizeof(float))) { } diff --git a/gr-blocks/lib/uchar_to_float_impl.h b/gr-blocks/lib/uchar_to_float_impl.h index 250dc2c86..1e3f4d59c 100644 --- a/gr-blocks/lib/uchar_to_float_impl.h +++ b/gr-blocks/lib/uchar_to_float_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_UCHAR_TO_FLOAT_IMPL_H #define INCLUDED_UCHAR_TO_FLOAT_IMPL_H -#include <blocks/uchar_to_float.h> +#include <gnuradio/blocks/uchar_to_float.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc index 7c1b0ed9e..a23d3274c 100644 --- a/gr-blocks/lib/udp_sink_impl.cc +++ b/gr-blocks/lib/udp_sink_impl.cc @@ -25,11 +25,11 @@ #endif #include "udp_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <boost/array.hpp> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> #include <stdexcept> #include <stdio.h> #include <string.h> @@ -50,9 +50,9 @@ namespace gr { udp_sink_impl::udp_sink_impl(size_t itemsize, const std::string &host, int port, int payload_size, bool eof) - : gr_sync_block("udp_sink", - gr_make_io_signature(1, 1, itemsize), - gr_make_io_signature(0, 0, 0)), + : sync_block("udp_sink", + io_signature::make(1, 1, itemsize), + io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_payload_size(payload_size), d_eof(eof), d_connected(false) { diff --git a/gr-blocks/lib/udp_sink_impl.h b/gr-blocks/lib/udp_sink_impl.h index 0f0d08142..c593e6e80 100644 --- a/gr-blocks/lib/udp_sink_impl.h +++ b/gr-blocks/lib/udp_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_UDP_SINK_IMPL_H #define INCLUDED_GR_UDP_SINK_IMPL_H -#include <blocks/udp_sink.h> +#include <gnuradio/blocks/udp_sink.h> #include <boost/asio.hpp> namespace gr { diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index 5b108c393..e62c2b0df 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -25,8 +25,8 @@ #endif #include "udp_source_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> #include <stdexcept> #include <errno.h> #include <stdio.h> @@ -48,9 +48,9 @@ namespace gr { udp_source_impl::udp_source_impl(size_t itemsize, const std::string &host, int port, int payload_size, bool eof) - : gr_sync_block("udp_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, itemsize)), + : sync_block("udp_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_payload_size(payload_size), d_eof(eof), d_connected(false), d_residual(0), d_sent(0), d_offset(0) { diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h index d6c773726..949364cf2 100644 --- a/gr-blocks/lib/udp_source_impl.h +++ b/gr-blocks/lib/udp_source_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_GR_UDP_SOURCE_IMPL_H #define INCLUDED_GR_UDP_SOURCE_IMPL_H -#include <blocks/udp_source.h> +#include <gnuradio/blocks/udp_source.h> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc index 367100be8..70055f938 100644 --- a/gr-blocks/lib/unpack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "unpack_k_bits_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <iostream> @@ -40,9 +40,9 @@ namespace gr { } unpack_k_bits_bb_impl::unpack_k_bits_bb_impl(unsigned k) - : gr_sync_interpolator("unpack_k_bits_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char)), + : sync_interpolator("unpack_k_bits_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char)), k), d_k(k) { diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.h b/gr-blocks/lib/unpack_k_bits_bb_impl.h index c72d16ebf..7355d235c 100644 --- a/gr-blocks/lib/unpack_k_bits_bb_impl.h +++ b/gr-blocks/lib/unpack_k_bits_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H #define INCLUDED_GR_UNPACK_K_BITS_BB_IMPL_H -#include <blocks/unpack_k_bits_bb.h> +#include <gnuradio/blocks/unpack_k_bits_bb.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t b/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t index 3a7428fd8..8e0657074 100644 --- a/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t +++ b/gr-blocks/lib/unpacked_to_packed_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME_IMPL@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <assert.h> namespace gr { @@ -37,17 +37,17 @@ namespace gr { @NAME@::sptr @NAME@::make(unsigned int bits_per_chunk, - gr_endianness_t endianness) + endianness_t endianness) { return gnuradio::get_initial_sptr (new @NAME_IMPL@(bits_per_chunk, endianness)); } @NAME_IMPL@::@NAME_IMPL@(unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block("@NAME@", - gr_make_io_signature(1, -1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, -1, sizeof(@O_TYPE@))), + endianness_t endianness) + : block("@NAME@", + io_signature::make(1, -1, sizeof(@I_TYPE@)), + io_signature::make(1, -1, sizeof(@O_TYPE@))), d_bits_per_chunk(bits_per_chunk), d_endianness(endianness), d_index(0) { assert(bits_per_chunk <= BITS_PER_TYPE); diff --git a/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t b/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t index c8f414c55..2076c65e9 100644 --- a/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t +++ b/gr-blocks/lib/unpacked_to_packed_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { @@ -34,12 +34,12 @@ namespace gr { { private: unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; + endianness_t d_endianness; unsigned int d_index; public: @NAME_IMPL@(unsigned int bits_per_chunk, - gr_endianness_t endianness); + endianness_t endianness); ~@NAME_IMPL@(); void forecast(int noutput_items, diff --git a/gr-blocks/lib/vco_f_impl.cc b/gr-blocks/lib/vco_f_impl.cc index 21e7d0a0f..42be98ad4 100644 --- a/gr-blocks/lib/vco_f_impl.cc +++ b/gr-blocks/lib/vco_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "vco_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <math.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } vco_f_impl::vco_f_impl(double sampling_rate, double sensitivity, double amplitude) - : gr_sync_block("vco_f", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("vco_f", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), d_sampling_rate(sampling_rate), d_sensitivity(sensitivity), d_amplitude(amplitude), d_k(d_sensitivity/d_sampling_rate) { diff --git a/gr-blocks/lib/vco_f_impl.h b/gr-blocks/lib/vco_f_impl.h index 37435b773..6e7a6dd7b 100644 --- a/gr-blocks/lib/vco_f_impl.h +++ b/gr-blocks/lib/vco_f_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_VCO_F_IMPL_H #define INCLUDED_GR_VCO_F_IMPL_H -#include <blocks/vco_f.h> -#include <gr_fxpt_vco.h> +#include <gnuradio/blocks/vco_f.h> +#include <gnuradio/fxpt_vco.h> namespace gr { namespace blocks { @@ -36,7 +36,7 @@ namespace gr { double d_sensitivity; double d_amplitude; double d_k; - gr_fxpt_vco d_vco; + gr::fxpt_vco d_vco; public: vco_f_impl(double sampling_rate, double sensitivity, double amplitude); diff --git a/gr-blocks/lib/vector_insert_X_impl.cc.t b/gr-blocks/lib/vector_insert_X_impl.cc.t index adf31fe05..a4645816d 100644 --- a/gr-blocks/lib/vector_insert_X_impl.cc.t +++ b/gr-blocks/lib/vector_insert_X_impl.cc.t @@ -28,7 +28,7 @@ #include <@NAME_IMPL@.h> #include <algorithm> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <stdio.h> @@ -44,9 +44,9 @@ namespace gr { @NAME_IMPL@::@NAME_IMPL@(const std::vector<@TYPE@> &data, int periodicity, int offset) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@TYPE@)), - gr_make_io_signature(1, 1, sizeof(@TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@TYPE@)), + io_signature::make(1, 1, sizeof(@TYPE@))), d_data(data), d_offset(offset), d_periodicity(periodicity) diff --git a/gr-blocks/lib/vector_insert_X_impl.h.t b/gr-blocks/lib/vector_insert_X_impl.h.t index f447ef1e8..12a7bbe6b 100644 --- a/gr-blocks/lib/vector_insert_X_impl.h.t +++ b/gr-blocks/lib/vector_insert_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/vector_map_impl.cc b/gr-blocks/lib/vector_map_impl.cc index 19b57bac8..d50dcb56b 100644 --- a/gr-blocks/lib/vector_map_impl.cc +++ b/gr-blocks/lib/vector_map_impl.cc @@ -25,7 +25,7 @@ #endif #include "vector_map_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -62,10 +62,10 @@ namespace gr { vector_map_impl::vector_map_impl(size_t item_size, std::vector<size_t> in_vlens, std::vector< std::vector< std::vector<size_t> > > mapping) - : gr_sync_block("vector_map", - gr_make_io_signaturev(in_vlens.size(), in_vlens.size(), + : sync_block("vector_map", + io_signature::makev(in_vlens.size(), in_vlens.size(), get_in_sizeofs(item_size, in_vlens)), - gr_make_io_signaturev(mapping.size(), mapping.size(), + io_signature::makev(mapping.size(), mapping.size(), get_out_sizeofs(item_size, mapping))), d_item_size(item_size), d_in_vlens(in_vlens) { diff --git a/gr-blocks/lib/vector_map_impl.h b/gr-blocks/lib/vector_map_impl.h index 08faa2ce0..64f5e091e 100644 --- a/gr-blocks/lib/vector_map_impl.h +++ b/gr-blocks/lib/vector_map_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_VECTOR_MAP_IMPL_H #define INCLUDED_GR_VECTOR_MAP_IMPL_H -#include <blocks/vector_map.h> -#include <thread/thread.h> +#include <gnuradio/blocks/vector_map.h> +#include <gnuradio/thread/thread.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/vector_sink_X_impl.cc.t b/gr-blocks/lib/vector_sink_X_impl.cc.t index 3be286102..a8d674f15 100644 --- a/gr-blocks/lib/vector_sink_X_impl.cc.t +++ b/gr-blocks/lib/vector_sink_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <algorithm> #include <iostream> @@ -42,9 +42,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(int vlen) - : gr_sync_block("@NAME@", - gr_make_io_signature(1, 1, sizeof(@TYPE@) * vlen), - gr_make_io_signature(0, 0, 0)), + : sync_block("@NAME@", + io_signature::make(1, 1, sizeof(@TYPE@) * vlen), + io_signature::make(0, 0, 0)), d_vlen(vlen) { } @@ -58,7 +58,7 @@ namespace gr { return d_data; } - std::vector<gr_tag_t> + std::vector<tag_t> @NAME_IMPL@::tags() const { return d_tags; @@ -73,7 +73,7 @@ namespace gr { for(int i = 0; i < noutput_items * d_vlen; i++) d_data.push_back (iptr[i]); - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0) + noutput_items); d_tags.insert(d_tags.end(), tags.begin(), tags.end()); return noutput_items; diff --git a/gr-blocks/lib/vector_sink_X_impl.h.t b/gr-blocks/lib/vector_sink_X_impl.h.t index 60d21e0c8..b5d3bd643 100644 --- a/gr-blocks/lib/vector_sink_X_impl.h.t +++ b/gr-blocks/lib/vector_sink_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { @@ -34,7 +34,7 @@ namespace gr { { private: std::vector<@TYPE@> d_data; - std::vector<gr_tag_t> d_tags; + std::vector<tag_t> d_tags; int d_vlen; public: @@ -43,7 +43,7 @@ namespace gr { void reset() { d_data.clear(); } std::vector<@TYPE@> data() const; - std::vector<gr_tag_t> tags() const; + std::vector<tag_t> tags() const; int work(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-blocks/lib/vector_source_X_impl.cc.t b/gr-blocks/lib/vector_source_X_impl.cc.t index 9c1c63a21..93f672bfb 100644 --- a/gr-blocks/lib/vector_source_X_impl.cc.t +++ b/gr-blocks/lib/vector_source_X_impl.cc.t @@ -28,7 +28,7 @@ #include <@NAME_IMPL@.h> #include <algorithm> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -37,7 +37,7 @@ namespace gr { @NAME@::sptr @NAME@::make(const std::vector<@TYPE@> &data, bool repeat, int vlen, - const std::vector<gr_tag_t> &tags) + const std::vector<tag_t> &tags) { return gnuradio::get_initial_sptr (new @NAME_IMPL@(data, repeat, vlen, tags)); @@ -45,10 +45,10 @@ namespace gr { @NAME_IMPL@::@NAME_IMPL@(const std::vector<@TYPE@> &data, bool repeat, int vlen, - const std::vector<gr_tag_t> &tags) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(@TYPE@) * vlen)), + const std::vector<tag_t> &tags) + : sync_block("@BASE_NAME@", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(@TYPE@) * vlen)), d_data(data), d_repeat(repeat), d_offset(0), @@ -72,7 +72,7 @@ namespace gr { void @NAME_IMPL@::set_data (const std::vector<@TYPE@> &data, - const std::vector<gr_tag_t> &tags) + const std::vector<tag_t> &tags) { d_data = data; d_tags = tags; diff --git a/gr-blocks/lib/vector_source_X_impl.h.t b/gr-blocks/lib/vector_source_X_impl.h.t index 78ec52bac..2641c6661 100644 --- a/gr-blocks/lib/vector_source_X_impl.h.t +++ b/gr-blocks/lib/vector_source_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { @@ -38,18 +38,18 @@ namespace gr { unsigned int d_offset; int d_vlen; bool d_settags; - std::vector<gr_tag_t> d_tags; + std::vector<tag_t> d_tags; unsigned int d_tagpos; public: @NAME_IMPL@(const std::vector<@TYPE@> &data, bool repeat, int vlen, - const std::vector<gr_tag_t> &tags); + const std::vector<tag_t> &tags); ~@NAME_IMPL@(); void rewind() { d_offset=0; } void set_data(const std::vector<@TYPE@> &data, - const std::vector<gr_tag_t> &tags); + const std::vector<tag_t> &tags); int work(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-blocks/lib/vector_to_stream_impl.cc b/gr-blocks/lib/vector_to_stream_impl.cc index fa833a3ec..637a25205 100644 --- a/gr-blocks/lib/vector_to_stream_impl.cc +++ b/gr-blocks/lib/vector_to_stream_impl.cc @@ -25,7 +25,7 @@ #endif #include "vector_to_stream_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } vector_to_stream_impl::vector_to_stream_impl(size_t itemsize, size_t nitems_per_block) - : gr_sync_interpolator ("vector_to_stream", - gr_make_io_signature (1, 1, itemsize * nitems_per_block), - gr_make_io_signature (1, 1, itemsize), + : sync_interpolator ("vector_to_stream", + io_signature::make (1, 1, itemsize * nitems_per_block), + io_signature::make (1, 1, itemsize), nitems_per_block) { } diff --git a/gr-blocks/lib/vector_to_stream_impl.h b/gr-blocks/lib/vector_to_stream_impl.h index 4128f6090..d2f4759cd 100644 --- a/gr-blocks/lib/vector_to_stream_impl.h +++ b/gr-blocks/lib/vector_to_stream_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VECTOR_TO_STREAM_IMPL_H #define INCLUDED_VECTOR_TO_STREAM_IMPL_H -#include <blocks/vector_to_stream.h> +#include <gnuradio/blocks/vector_to_stream.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/vector_to_streams_impl.cc b/gr-blocks/lib/vector_to_streams_impl.cc index 09d32c5c5..99f35b0ab 100644 --- a/gr-blocks/lib/vector_to_streams_impl.cc +++ b/gr-blocks/lib/vector_to_streams_impl.cc @@ -25,7 +25,7 @@ #endif #include "vector_to_streams_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -36,9 +36,9 @@ namespace gr { } vector_to_streams_impl::vector_to_streams_impl(size_t itemsize, size_t nstreams) - : gr_sync_block ("vector_to_streams", - gr_make_io_signature (1, 1, nstreams * itemsize), - gr_make_io_signature (nstreams, nstreams, itemsize)) + : sync_block ("vector_to_streams", + io_signature::make (1, 1, nstreams * itemsize), + io_signature::make (nstreams, nstreams, itemsize)) { } diff --git a/gr-blocks/lib/vector_to_streams_impl.h b/gr-blocks/lib/vector_to_streams_impl.h index 81bcfd076..b5393729e 100644 --- a/gr-blocks/lib/vector_to_streams_impl.h +++ b/gr-blocks/lib/vector_to_streams_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VECTOR_TO_STREAMS_IMPL_H #define INCLUDED_VECTOR_TO_STREAMS_IMPL_H -#include <blocks/vector_to_streams.h> +#include <gnuradio/blocks/vector_to_streams.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc index 16d80adc8..e741cbab4 100644 --- a/gr-blocks/lib/wavfile.cc +++ b/gr-blocks/lib/wavfile.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <blocks/wavfile.h> +#include <gnuradio/blocks/wavfile.h> #include <cstring> #include <stdint.h> #include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN diff --git a/gr-blocks/lib/wavfile_sink_impl.cc b/gr-blocks/lib/wavfile_sink_impl.cc index 4591b1f9f..9a96f7ca3 100644 --- a/gr-blocks/lib/wavfile_sink_impl.cc +++ b/gr-blocks/lib/wavfile_sink_impl.cc @@ -25,14 +25,14 @@ #endif #include "wavfile_sink_impl.h" -#include <blocks/wavfile.h> -#include <gr_io_signature.h> +#include <gnuradio/blocks/wavfile.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <climits> #include <cstring> #include <cmath> #include <fcntl.h> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> #include <boost/math/special_functions/round.hpp> // win32 (mingw/msvc) specific @@ -70,9 +70,9 @@ namespace gr { int n_channels, unsigned int sample_rate, int bits_per_sample) - : gr_sync_block("wavfile_sink", - gr_make_io_signature(1, n_channels, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("wavfile_sink", + io_signature::make(1, n_channels, sizeof(float)), + io_signature::make(0, 0, 0)), d_sample_rate(sample_rate), d_nchans(n_channels), d_fp(0), d_new_fp(0), d_updated(false) { diff --git a/gr-blocks/lib/wavfile_sink_impl.h b/gr-blocks/lib/wavfile_sink_impl.h index 4ad995888..52dfd2259 100644 --- a/gr-blocks/lib/wavfile_sink_impl.h +++ b/gr-blocks/lib/wavfile_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_WAVFILE_SINK_IMPL_H #define INCLUDED_GR_WAVFILE_SINK_IMPL_H -#include <blocks/wavfile_sink.h> +#include <gnuradio/blocks/wavfile_sink.h> namespace gr { namespace blocks { diff --git a/gr-blocks/lib/wavfile_source_impl.cc b/gr-blocks/lib/wavfile_source_impl.cc index 2e3b0e240..7538792d1 100644 --- a/gr-blocks/lib/wavfile_source_impl.cc +++ b/gr-blocks/lib/wavfile_source_impl.cc @@ -25,8 +25,8 @@ #endif #include "wavfile_source_impl.h" -#include <gr_io_signature.h> -#include <blocks/wavfile.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/wavfile.h> #include <sys/types.h> #include <fcntl.h> #include <stdexcept> @@ -58,9 +58,9 @@ namespace gr { } wavfile_source_impl::wavfile_source_impl (const char *filename, bool repeat) - : gr_sync_block("wavfile_source", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 2, sizeof(float))), + : sync_block("wavfile_source", + io_signature::make(0, 0, 0), + io_signature::make(1, 2, sizeof(float))), d_fp(NULL), d_repeat(repeat), d_sample_rate(1), d_nchans(1), d_bytes_per_sample(2), d_first_sample_pos(0), d_samples_per_chan(0), d_sample_idx(0) @@ -102,7 +102,7 @@ namespace gr { } // Re-set the output signature - set_output_signature(gr_make_io_signature(1, d_nchans, sizeof(float))); + set_output_signature(io_signature::make(1, d_nchans, sizeof(float))); } wavfile_source_impl::~wavfile_source_impl () diff --git a/gr-blocks/lib/wavfile_source_impl.h b/gr-blocks/lib/wavfile_source_impl.h index 4875731a0..3996cb060 100644 --- a/gr-blocks/lib/wavfile_source_impl.h +++ b/gr-blocks/lib/wavfile_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_WAVFILE_SOURCE_IMPL_H #define INCLUDED_GR_WAVFILE_SOURCE_IMPL_H -#include <blocks/wavfile_source.h> +#include <gnuradio/blocks/wavfile_source.h> #include <cstdio> // for FILE namespace gr { diff --git a/gr-blocks/lib/xor_XX_impl.cc.t b/gr-blocks/lib/xor_XX_impl.cc.t index eea926512..6b9df4f4f 100644 --- a/gr-blocks/lib/xor_XX_impl.cc.t +++ b/gr-blocks/lib/xor_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include <@NAME_IMPL@.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace blocks { @@ -38,9 +38,9 @@ namespace gr { } @NAME_IMPL@::@NAME_IMPL@(size_t vlen) - : gr_sync_block ("@NAME@", - gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)), + : sync_block ("@NAME@", + io_signature::make (1, -1, sizeof (@I_TYPE@)*vlen), + io_signature::make (1, 1, sizeof (@O_TYPE@)*vlen)), d_vlen(vlen) { } diff --git a/gr-blocks/lib/xor_XX_impl.h.t b/gr-blocks/lib/xor_XX_impl.h.t index 25f0da0c8..f7db3f216 100644 --- a/gr-blocks/lib/xor_XX_impl.h.t +++ b/gr-blocks/lib/xor_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME_IMPL@ #define @GUARD_NAME_IMPL@ -#include <blocks/@NAME@.h> +#include <gnuradio/blocks/@NAME@.h> namespace gr { namespace blocks { diff --git a/gr-blocks/python/blocks/__init__.py b/gr-blocks/python/blocks/__init__.py index 4274ac54a..b7ba794ea 100644 --- a/gr-blocks/python/blocks/__init__.py +++ b/gr-blocks/python/blocks/__init__.py @@ -20,8 +20,7 @@ # ''' -This is the gr-blocks package. This package provides GNU Radio -processing blocks common to many flowgraphs. +Processing blocks common to many flowgraphs. ''' import os diff --git a/gr-blocks/python/blocks/qa_keep_one_in_n.py b/gr-blocks/python/blocks/qa_keep_one_in_n.py index d8251fe61..2a5d936cc 100755 --- a/gr-blocks/python/blocks/qa_keep_one_in_n.py +++ b/gr-blocks/python/blocks/qa_keep_one_in_n.py @@ -36,6 +36,7 @@ class test_keep_one_in_n(gr_unittest.TestCase): src = blocks.vector_source_b(src_data); op = blocks.keep_one_in_n(gr.sizeof_char, 5) dst = blocks.vector_sink_b() + print "HERE" self.tb.connect(src, op, dst) self.tb.run() self.assertEqual(dst.data(), expected_data) diff --git a/gr-blocks/python/qa_message_tags.py b/gr-blocks/python/qa_message_tags.py index 0ab857b1a..952c69945 100644 --- a/gr-blocks/python/qa_message_tags.py +++ b/gr-blocks/python/qa_message_tags.py @@ -7,8 +7,8 @@ class test_message_tags (gr_unittest.TestCase): def test_1 (self): data = ('hello', 'you', 'there') - tx_msgq = gr.msg_queue () - rx_msgq = gr.msg_queue () + tx_msgq = gr.msg_queue() + rx_msgq = gr.msg_queue() for d in data: tx_msgq.insert_tail(gr.message_from_string(d)) tb = gr.top_block() diff --git a/gr-blocks/python/qa_repack_bits_bb.py b/gr-blocks/python/qa_repack_bits_bb.py index 9da6cf26c..209b6e132 100755 --- a/gr-blocks/python/qa_repack_bits_bb.py +++ b/gr-blocks/python/qa_repack_bits_bb.py @@ -79,7 +79,7 @@ class qa_repack_bits_bb (gr_unittest.TestCase): k = 8 l = 3 tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(src_data)) @@ -104,7 +104,7 @@ class qa_repack_bits_bb (gr_unittest.TestCase): k = 3 l = 8 tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(src_data)) diff --git a/gr-blocks/python/qa_tag_gate.py b/gr-blocks/python/qa_tag_gate.py new file mode 100755 index 000000000..1999f7a35 --- /dev/null +++ b/gr-blocks/python/qa_tag_gate.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# +# Copyright 2013 <+YOU OR YOUR COMPANY+>. +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this software; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +from gnuradio import gr, gr_unittest +import pmt +import blocks_swig as blocks + + +class qa_tag_gate (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test_001_t (self): + tag = gr.tag_t() + tag.key = pmt.string_to_symbol('key') + tag.value = pmt.from_long(42) + tag.offset = 0 + src = blocks.vector_source_f(range(20), False, 1, (tag,)) + gate = blocks.tag_gate(gr.sizeof_float, False) + sink = blocks.vector_sink_f() + self.tb.run () + self.assertEqual(len(sink.tags()), 0) + +if __name__ == '__main__': + gr_unittest.run(qa_tag_gate, "qa_tag_gate.xml") + diff --git a/gr-blocks/python/qa_tagged_stream_mux.py b/gr-blocks/python/qa_tagged_stream_mux.py index 1759c4462..e9c334300 100755 --- a/gr-blocks/python/qa_tagged_stream_mux.py +++ b/gr-blocks/python/qa_tagged_stream_mux.py @@ -27,7 +27,7 @@ import numpy def make_len_tags(tupl, key): tags = [] - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.key = pmt.string_to_symbol(key) n_read = 0 for element in tupl: @@ -38,7 +38,7 @@ def make_len_tags(tupl, key): return tags def make_len_tag(offset, key, value): - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = offset tag.key = pmt.string_to_symbol(key) tag.value = pmt.to_pmt(value) @@ -73,11 +73,11 @@ class qa_tagged_stream_mux (gr_unittest.TestCase): make_len_tag(5, tagname, 3), make_len_tag(8, tagname, 1) ) - test_tag_0 = gr.gr_tag_t() + test_tag_0 = gr.tag_t() test_tag_0.key = pmt.string_to_symbol('spam') test_tag_0.offset = 4 # On the second '1' test_tag_0.value = pmt.to_pmt(42) - test_tag_1 = gr.gr_tag_t() + test_tag_1 = gr.tag_t() test_tag_1.key = pmt.string_to_symbol('eggs') test_tag_1.offset = 3 # On the first '3' of the 2nd stream test_tag_1.value = pmt.to_pmt(23) diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt index 09fcf7692..a3cf23b33 100644 --- a/gr-blocks/swig/CMakeLists.txt +++ b/gr-blocks/swig/CMakeLists.txt @@ -24,7 +24,6 @@ include(GrPython) include(GrSwig) set(GR_SWIG_INCLUDE_DIRS - ${CMAKE_CURRENT_BINARY_DIR}/../include ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} @@ -51,11 +50,17 @@ set(GR_SWIG_BLOCK_IFILES blocks_swig0 blocks_swig1 blocks_swig2 + blocks_swig3 + blocks_swig4 + blocks_swig5 ) foreach(swigfile ${GR_SWIG_BLOCK_IFILES}) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i) - set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/blocks) + set(GR_SWIG_DOC_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/blocks + ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/blocks + ) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_TARGET_DEPS blocks_generated_includes) set(GR_SWIG_LIBRARIES gnuradio-blocks) diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i deleted file mode 100644 index f808d1e77..000000000 --- a/gr-blocks/swig/blocks_swig.i +++ /dev/null @@ -1,638 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012-2013 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#define BLOCKS_API - -%include "runtime_swig.i" -%include "blocks/pdu.h" - -//load generated python docstrings -%include "blocks_swig_doc.i" - -%include <gr_endianness.h> - -// For vector_map. -%template() std::vector< std::vector< std::vector<size_t> > >; - -%{ -#include "blocks/add_ff.h" -#include "blocks/add_ss.h" -#include "blocks/add_ii.h" -#include "blocks/add_cc.h" -#include "blocks/add_const_ff.h" -#include "blocks/add_const_bb.h" -#include "blocks/add_const_ss.h" -#include "blocks/add_const_ii.h" -#include "blocks/add_const_cc.h" -#include "blocks/add_const_vff.h" -#include "blocks/add_const_vbb.h" -#include "blocks/add_const_vss.h" -#include "blocks/add_const_vii.h" -#include "blocks/add_const_vcc.h" -#include "blocks/and_bb.h" -#include "blocks/and_ss.h" -#include "blocks/and_ii.h" -#include "blocks/and_const_bb.h" -#include "blocks/and_const_ss.h" -#include "blocks/and_const_ii.h" -#include "blocks/annotator_1to1.h" -#include "blocks/annotator_alltoall.h" -#include "blocks/annotator_raw.h" -#include "blocks/argmax_fs.h" -#include "blocks/argmax_is.h" -#include "blocks/argmax_ss.h" -#include "blocks/bin_statistics_f.h" -#include "blocks/burst_tagger.h" -#include "blocks/char_to_float.h" -#include "blocks/char_to_short.h" -#include "blocks/check_lfsr_32k_s.h" -#include "blocks/complex_to_interleaved_short.h" -#include "blocks/complex_to_float.h" -#include "blocks/complex_to_real.h" -#include "blocks/complex_to_imag.h" -#include "blocks/complex_to_mag.h" -#include "blocks/complex_to_mag_squared.h" -#include "blocks/complex_to_arg.h" -#include "blocks/conjugate_cc.h" -#include "blocks/control_loop.h" -#include "blocks/copy.h" -#include "blocks/deinterleave.h" -#include "blocks/delay.h" -#include "blocks/divide_ff.h" -#include "blocks/divide_ss.h" -#include "blocks/divide_ii.h" -#include "blocks/divide_cc.h" -#include "blocks/endian_swap.h" -#include "blocks/file_descriptor_sink.h" -#include "blocks/file_descriptor_source.h" -#include "blocks/file_sink_base.h" -#include "blocks/file_sink.h" -#include "blocks/file_source.h" -#include "blocks/file_meta_sink.h" -#include "blocks/file_meta_source.h" -#include "blocks/float_to_char.h" -#include "blocks/float_to_complex.h" -#include "blocks/float_to_int.h" -#include "blocks/float_to_short.h" -#include "blocks/float_to_uchar.h" -#include "blocks/head.h" -#include "blocks/int_to_float.h" -#include "blocks/integrate_ss.h" -#include "blocks/integrate_ii.h" -#include "blocks/integrate_ff.h" -#include "blocks/integrate_cc.h" -#include "blocks/interleave.h" -#include "blocks/interleaved_short_to_complex.h" -#include "blocks/keep_m_in_n.h" -#include "blocks/keep_one_in_n.h" -#include "blocks/lfsr_32k_source_s.h" -#include "blocks/max_ff.h" -#include "blocks/max_ii.h" -#include "blocks/max_ss.h" -#include "blocks/message_debug.h" -#include "blocks/message_sink.h" -#include "blocks/message_source.h" -#include "blocks/message_strobe.h" -#include "blocks/message_burst_source.h" -#include "blocks/moving_average_cc.h" -#include "blocks/moving_average_ff.h" -#include "blocks/moving_average_ii.h" -#include "blocks/moving_average_ss.h" -#include "blocks/multiply_ss.h" -#include "blocks/multiply_ii.h" -#include "blocks/multiply_ff.h" -#include "blocks/multiply_cc.h" -#include "blocks/multiply_conjugate_cc.h" -#include "blocks/multiply_const_ss.h" -#include "blocks/multiply_const_ii.h" -#include "blocks/multiply_const_ff.h" -#include "blocks/multiply_const_cc.h" -#include "blocks/multiply_const_vss.h" -#include "blocks/multiply_const_vii.h" -#include "blocks/multiply_const_vff.h" -#include "blocks/multiply_const_vcc.h" -#include "blocks/mute_ss.h" -#include "blocks/mute_ii.h" -#include "blocks/mute_ff.h" -#include "blocks/mute_cc.h" -#include "blocks/nlog10_ff.h" -#include "blocks/nop.h" -#include "blocks/not_bb.h" -#include "blocks/not_ss.h" -#include "blocks/not_ii.h" -#include "blocks/null_sink.h" -#include "blocks/null_source.h" -#include "blocks/patterned_interleaver.h" -#include "blocks/pack_k_bits_bb.h" -#include "blocks/packed_to_unpacked_bb.h" -#include "blocks/packed_to_unpacked_ss.h" -#include "blocks/packed_to_unpacked_ii.h" -#include "blocks/pdu_to_tagged_stream.h" -#include "blocks/peak_detector_fb.h" -#include "blocks/peak_detector_ib.h" -#include "blocks/peak_detector_sb.h" -#include "blocks/peak_detector2_fb.h" -#include "blocks/plateau_detector_fb.h" -#include "blocks/probe_rate.h" -#include "blocks/probe_signal_b.h" -#include "blocks/probe_signal_s.h" -#include "blocks/probe_signal_i.h" -#include "blocks/probe_signal_f.h" -#include "blocks/probe_signal_c.h" -#include "blocks/probe_signal_vb.h" -#include "blocks/probe_signal_vs.h" -#include "blocks/probe_signal_vi.h" -#include "blocks/probe_signal_vf.h" -#include "blocks/probe_signal_vc.h" -#include "blocks/or_bb.h" -#include "blocks/or_ss.h" -#include "blocks/or_ii.h" -#include "blocks/random_pdu.h" -#include "blocks/regenerate_bb.h" -#include "blocks/repack_bits_bb.h" -#include "blocks/repeat.h" -#include "blocks/rms_cf.h" -#include "blocks/rms_ff.h" -#include "blocks/sample_and_hold_bb.h" -#include "blocks/sample_and_hold_ss.h" -#include "blocks/sample_and_hold_ii.h" -#include "blocks/sample_and_hold_ff.h" -#include "blocks/short_to_char.h" -#include "blocks/short_to_float.h" -#include "blocks/skiphead.h" -#include "blocks/socket_pdu.h" -#include "blocks/stream_mux.h" -#include "blocks/stream_to_streams.h" -#include "blocks/stream_to_vector.h" -#include "blocks/streams_to_stream.h" -#include "blocks/streams_to_vector.h" -#include "blocks/stretch_ff.h" -#include "blocks/sub_ff.h" -#include "blocks/sub_ss.h" -#include "blocks/sub_ii.h" -#include "blocks/sub_cc.h" -#include "blocks/tag_debug.h" -#include "blocks/tagged_file_sink.h" -#include "blocks/tagged_stream_mux.h" -#include "blocks/tagged_stream_to_pdu.h" -#include "blocks/threshold_ff.h" -#include "blocks/throttle.h" -#include "blocks/transcendental.h" -#include "blocks/tuntap_pdu.h" -#include "blocks/uchar_to_float.h" -#include "blocks/udp_sink.h" -#include "blocks/udp_source.h" -#include "blocks/unpack_k_bits_bb.h" -#include "blocks/unpacked_to_packed_bb.h" -#include "blocks/unpacked_to_packed_ss.h" -#include "blocks/unpacked_to_packed_ii.h" -#include "blocks/vco_f.h" -#include "blocks/vector_map.h" -#include "blocks/vector_to_stream.h" -#include "blocks/vector_to_streams.h" -#include "blocks/vector_insert_b.h" -#include "blocks/vector_insert_s.h" -#include "blocks/vector_insert_i.h" -#include "blocks/vector_insert_f.h" -#include "blocks/vector_insert_c.h" -#include "blocks/vector_sink_b.h" -#include "blocks/vector_sink_s.h" -#include "blocks/vector_sink_i.h" -#include "blocks/vector_sink_f.h" -#include "blocks/vector_sink_c.h" -#include "blocks/vector_source_b.h" -#include "blocks/vector_source_s.h" -#include "blocks/vector_source_i.h" -#include "blocks/vector_source_f.h" -#include "blocks/vector_source_c.h" -#include "blocks/wavfile_sink.h" -#include "blocks/wavfile_source.h" -#include "blocks/xor_bb.h" -#include "blocks/xor_ss.h" -#include "blocks/xor_ii.h" -%} - -%include "blocks/add_ff.h" -%include "blocks/add_ss.h" -%include "blocks/add_ii.h" -%include "blocks/add_cc.h" -%include "blocks/add_const_ff.h" -%include "blocks/add_const_bb.h" -%include "blocks/add_const_ss.h" -%include "blocks/add_const_ii.h" -%include "blocks/add_const_cc.h" -%include "blocks/add_const_vff.h" -%include "blocks/add_const_vbb.h" -%include "blocks/add_const_vss.h" -%include "blocks/add_const_vii.h" -%include "blocks/add_const_vcc.h" -%include "blocks/and_bb.h" -%include "blocks/and_ss.h" -%include "blocks/and_ii.h" -%include "blocks/and_const_bb.h" -%include "blocks/and_const_ss.h" -%include "blocks/and_const_ii.h" -%include "blocks/annotator_1to1.h" -%include "blocks/annotator_alltoall.h" -%include "blocks/annotator_raw.h" -%include "blocks/argmax_fs.h" -%include "blocks/argmax_is.h" -%include "blocks/argmax_ss.h" -%include "blocks/char_to_float.h" -%include "blocks/bin_statistics_f.h" -%include "blocks/burst_tagger.h" -%include "blocks/char_to_short.h" -%include "blocks/check_lfsr_32k_s.h" -%include "blocks/complex_to_interleaved_short.h" -%include "blocks/complex_to_float.h" -%include "blocks/complex_to_real.h" -%include "blocks/complex_to_imag.h" -%include "blocks/complex_to_mag.h" -%include "blocks/complex_to_mag_squared.h" -%include "blocks/complex_to_arg.h" -%include "blocks/conjugate_cc.h" -%include "blocks/control_loop.h" -%include "blocks/copy.h" -%include "blocks/deinterleave.h" -%include "blocks/delay.h" -%include "blocks/file_descriptor_sink.h" -%include "blocks/file_descriptor_source.h" -%include "blocks/file_sink_base.h" -%include "blocks/file_sink.h" -%include "blocks/file_source.h" -%include "blocks/file_meta_sink.h" -%include "blocks/file_meta_source.h" -%include "blocks/divide_ff.h" -%include "blocks/divide_ss.h" -%include "blocks/divide_ii.h" -%include "blocks/divide_cc.h" -%include "blocks/endian_swap.h" -%include "blocks/float_to_char.h" -%include "blocks/float_to_complex.h" -%include "blocks/float_to_int.h" -%include "blocks/float_to_short.h" -%include "blocks/float_to_uchar.h" -%include "blocks/head.h" -%include "blocks/int_to_float.h" -%include "blocks/integrate_ss.h" -%include "blocks/integrate_ii.h" -%include "blocks/integrate_ff.h" -%include "blocks/integrate_cc.h" -%include "blocks/interleave.h" -%include "blocks/interleaved_short_to_complex.h" -%include "blocks/keep_m_in_n.h" -%include "blocks/keep_one_in_n.h" -%include "blocks/lfsr_32k_source_s.h" -%include "blocks/max_ff.h" -%include "blocks/max_ii.h" -%include "blocks/max_ss.h" -%include "blocks/message_debug.h" -%include "blocks/message_sink.h" -%include "blocks/message_source.h" -%include "blocks/message_strobe.h" -%include "blocks/message_burst_source.h" -%include "blocks/moving_average_cc.h" -%include "blocks/moving_average_ff.h" -%include "blocks/moving_average_ii.h" -%include "blocks/moving_average_ss.h" -%include "blocks/multiply_ss.h" -%include "blocks/multiply_ii.h" -%include "blocks/multiply_ff.h" -%include "blocks/multiply_cc.h" -%include "blocks/multiply_conjugate_cc.h" -%include "blocks/multiply_const_ss.h" -%include "blocks/multiply_const_ii.h" -%include "blocks/multiply_const_ff.h" -%include "blocks/multiply_const_cc.h" -%include "blocks/multiply_const_vss.h" -%include "blocks/multiply_const_vii.h" -%include "blocks/multiply_const_vff.h" -%include "blocks/multiply_const_vcc.h" -%include "blocks/mute_ss.h" -%include "blocks/mute_ii.h" -%include "blocks/mute_ff.h" -%include "blocks/mute_cc.h" -%include "blocks/nlog10_ff.h" -%include "blocks/nop.h" -%include "blocks/not_bb.h" -%include "blocks/not_ss.h" -%include "blocks/not_ii.h" -%include "blocks/null_sink.h" -%include "blocks/null_source.h" -%include "blocks/probe_signal_b.h" -%include "blocks/probe_signal_s.h" -%include "blocks/probe_signal_i.h" -%include "blocks/probe_signal_f.h" -%include "blocks/probe_signal_c.h" -%include "blocks/probe_signal_vb.h" -%include "blocks/probe_signal_vs.h" -%include "blocks/probe_signal_vi.h" -%include "blocks/probe_signal_vf.h" -%include "blocks/probe_signal_vc.h" -%include "blocks/or_bb.h" -%include "blocks/or_ss.h" -%include "blocks/or_ii.h" -%include "blocks/pack_k_bits_bb.h" -%include "blocks/packed_to_unpacked_bb.h" -%include "blocks/packed_to_unpacked_ss.h" -%include "blocks/packed_to_unpacked_ii.h" -%include "blocks/patterned_interleaver.h" -%include "blocks/tag_debug.h" -%include "blocks/pdu_to_tagged_stream.h" -%include "blocks/peak_detector_fb.h" -%include "blocks/peak_detector_ib.h" -%include "blocks/peak_detector_sb.h" -%include "blocks/peak_detector2_fb.h" -%include "blocks/random_pdu.h" -%include "blocks/plateau_detector_fb.h" -%include "blocks/probe_rate.h" -%include "blocks/regenerate_bb.h" -%include "blocks/repack_bits_bb.h" -%include "blocks/repeat.h" -%include "blocks/rms_cf.h" -%include "blocks/rms_ff.h" -%include "blocks/sample_and_hold_bb.h" -%include "blocks/sample_and_hold_ss.h" -%include "blocks/sample_and_hold_ii.h" -%include "blocks/sample_and_hold_ff.h" -%include "blocks/short_to_char.h" -%include "blocks/short_to_float.h" -%include "blocks/skiphead.h" -%include "blocks/socket_pdu.h" -%include "blocks/stream_mux.h" -%include "blocks/stream_to_streams.h" -%include "blocks/stream_to_vector.h" -%include "blocks/streams_to_stream.h" -%include "blocks/streams_to_vector.h" -%include "blocks/stretch_ff.h" -%include "blocks/sub_ff.h" -%include "blocks/sub_ss.h" -%include "blocks/sub_ii.h" -%include "blocks/sub_cc.h" -%include "blocks/tagged_file_sink.h" -%include "blocks/tagged_stream_mux.h" -%include "blocks/tagged_stream_to_pdu.h" -%include "blocks/threshold_ff.h" -%include "blocks/throttle.h" -%include "blocks/transcendental.h" -%include "blocks/tuntap_pdu.h" -%include "blocks/uchar_to_float.h" -%include "blocks/udp_sink.h" -%include "blocks/udp_source.h" -%include "blocks/unpack_k_bits_bb.h" -%include "blocks/unpacked_to_packed_bb.h" -%include "blocks/unpacked_to_packed_ss.h" -%include "blocks/unpacked_to_packed_ii.h" -%include "blocks/vco_f.h" -%include "blocks/vector_map.h" -%include "blocks/vector_to_stream.h" -%include "blocks/vector_to_streams.h" -%include "blocks/vector_insert_b.h" -%include "blocks/vector_insert_s.h" -%include "blocks/vector_insert_i.h" -%include "blocks/vector_insert_f.h" -%include "blocks/vector_insert_c.h" -%include "blocks/vector_sink_b.h" -%include "blocks/vector_sink_s.h" -%include "blocks/vector_sink_i.h" -%include "blocks/vector_sink_f.h" -%include "blocks/vector_sink_c.h" -%include "blocks/vector_source_b.h" -%include "blocks/vector_source_s.h" -%include "blocks/vector_source_i.h" -%include "blocks/vector_source_f.h" -%include "blocks/vector_source_c.h" -%include "blocks/wavfile_sink.h" -%include "blocks/wavfile_source.h" -%include "blocks/xor_bb.h" -%include "blocks/xor_ss.h" -%include "blocks/xor_ii.h" - -GR_SWIG_BLOCK_MAGIC2(blocks, add_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, add_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, add_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, add_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc); -GR_SWIG_BLOCK_MAGIC2(blocks, and_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, and_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, and_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, annotator_1to1); -GR_SWIG_BLOCK_MAGIC2(blocks, annotator_alltoall); -GR_SWIG_BLOCK_MAGIC2(blocks, annotator_raw); -GR_SWIG_BLOCK_MAGIC2(blocks, argmax_fs); -GR_SWIG_BLOCK_MAGIC2(blocks, argmax_is); -GR_SWIG_BLOCK_MAGIC2(blocks, argmax_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, bin_statistics_f); -GR_SWIG_BLOCK_MAGIC2(blocks, burst_tagger); -GR_SWIG_BLOCK_MAGIC2(blocks, char_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, char_to_short); -GR_SWIG_BLOCK_MAGIC2(blocks, check_lfsr_32k_s); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_interleaved_short); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_real); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_imag); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg); -GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, copy); -GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave); -GR_SWIG_BLOCK_MAGIC2(blocks, delay); -GR_SWIG_BLOCK_MAGIC2(blocks, endian_swap); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, file_descriptor_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, file_descriptor_source); -GR_SWIG_BLOCK_MAGIC2(blocks, file_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, file_source); -GR_SWIG_BLOCK_MAGIC2(blocks, file_meta_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, file_meta_source); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar); -GR_SWIG_BLOCK_MAGIC2(blocks, head); -GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, interleave); -GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex); -GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n); -GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n); -GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s); -GR_SWIG_BLOCK_MAGIC2(blocks, max_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, max_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, max_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, message_debug); -GR_SWIG_BLOCK_MAGIC2(blocks, message_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, message_source); -GR_SWIG_BLOCK_MAGIC2(blocks, message_strobe); -GR_SWIG_BLOCK_MAGIC2(blocks, message_burst_source); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_conjugate_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vii); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vff); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vcc); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, nop); -GR_SWIG_BLOCK_MAGIC2(blocks, not_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, not_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, not_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, null_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, null_source); -GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver); -GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb); -GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb); -GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate); -GR_SWIG_BLOCK_MAGIC2(blocks, or_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, or_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, or_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_f); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_c); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vb); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vs); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vi); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vf); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vc); -GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, repeat); -GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf); -GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char); -GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, skiphead); -GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux); -GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams); -GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector); -GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream); -GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector); -GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, throttle); -GR_SWIG_BLOCK_MAGIC2(blocks, transcendental); -GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, udp_source); -GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, vco_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_map); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c); -GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source); -GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii); - - -#ifdef GR_CTRLPORT - -%{ -#include "blocks/ctrlport_probe_c.h" -#include "blocks/ctrlport_probe2_c.h" -%} - -%include "blocks/ctrlport_probe_c.h" -%include "blocks/ctrlport_probe2_c.h" - -GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe_c); -GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe2_c); - -#endif /* GR_CTRLPORT */ diff --git a/gr-blocks/swig/blocks_swig.py.in b/gr-blocks/swig/blocks_swig.py.in index 287413b59..a0bd574c1 100644 --- a/gr-blocks/swig/blocks_swig.py.in +++ b/gr-blocks/swig/blocks_swig.py.in @@ -22,3 +22,6 @@ from blocks_swig0 import * from blocks_swig1 import * from blocks_swig2 import * +from blocks_swig3 import * +from blocks_swig4 import * +from blocks_swig5 import * diff --git a/gr-blocks/swig/blocks_swig0.i b/gr-blocks/swig/blocks_swig0.i index 353fef041..f87cb9c5e 100644 --- a/gr-blocks/swig/blocks_swig0.i +++ b/gr-blocks/swig/blocks_swig0.i @@ -26,116 +26,55 @@ %include "blocks_swig0_doc.i" -%template() std::vector<size_t>; -%template() std::vector< std::vector< std::vector<size_t> > >; - %{ -#include "blocks/annotator_1to1.h" -#include "blocks/annotator_alltoall.h" -#include "blocks/annotator_raw.h" -#include "blocks/control_loop.h" -#include "blocks/copy.h" -#include "blocks/delay.h" -#include "blocks/endian_swap.h" -#include "blocks/file_descriptor_sink.h" -#include "blocks/file_descriptor_source.h" -#include "blocks/file_sink_base.h" -#include "blocks/file_sink.h" -#include "blocks/file_source.h" -#include "blocks/file_meta_sink.h" -#include "blocks/file_meta_source.h" -#include "blocks/head.h" -#include "blocks/message_debug.h" -#include "blocks/message_sink.h" -#include "blocks/message_source.h" -#include "blocks/message_strobe.h" -#include "blocks/message_burst_source.h" -#include "blocks/nop.h" -#include "blocks/null_sink.h" -#include "blocks/null_source.h" -#include "blocks/skiphead.h" -#include "blocks/stream_mux.h" -#include "blocks/stream_to_streams.h" -#include "blocks/stream_to_vector.h" -#include "blocks/streams_to_stream.h" -#include "blocks/streams_to_vector.h" -#include "blocks/tag_debug.h" -#include "blocks/tagged_file_sink.h" -#include "blocks/throttle.h" -#include "blocks/vector_map.h" -#include "blocks/vector_to_stream.h" -#include "blocks/vector_to_streams.h" -#include "blocks/vector_insert_b.h" -#include "blocks/vector_insert_s.h" -#include "blocks/vector_insert_i.h" -#include "blocks/vector_insert_f.h" -#include "blocks/vector_insert_c.h" -#include "blocks/vector_sink_b.h" -#include "blocks/vector_sink_s.h" -#include "blocks/vector_sink_i.h" -#include "blocks/vector_sink_f.h" -#include "blocks/vector_sink_c.h" -#include "blocks/vector_source_b.h" -#include "blocks/vector_source_s.h" -#include "blocks/vector_source_i.h" -#include "blocks/vector_source_f.h" -#include "blocks/vector_source_c.h" -#include "blocks/wavfile_sink.h" -#include "blocks/wavfile_source.h" +#include "gnuradio/blocks/annotator_1to1.h" +#include "gnuradio/blocks/annotator_alltoall.h" +#include "gnuradio/blocks/annotator_raw.h" +#include "gnuradio/blocks/control_loop.h" +#include "gnuradio/blocks/copy.h" +#include "gnuradio/blocks/delay.h" +#include "gnuradio/blocks/endian_swap.h" +#include "gnuradio/blocks/file_descriptor_sink.h" +#include "gnuradio/blocks/file_descriptor_source.h" +#include "gnuradio/blocks/file_sink_base.h" +#include "gnuradio/blocks/file_sink.h" +#include "gnuradio/blocks/file_source.h" +#include "gnuradio/blocks/file_meta_sink.h" +#include "gnuradio/blocks/file_meta_source.h" +#include "gnuradio/blocks/head.h" +#include "gnuradio/blocks/message_debug.h" +#include "gnuradio/blocks/message_sink.h" +#include "gnuradio/blocks/message_source.h" +#include "gnuradio/blocks/message_strobe.h" +#include "gnuradio/blocks/message_burst_source.h" +#include "gnuradio/blocks/nop.h" +#include "gnuradio/blocks/null_sink.h" +#include "gnuradio/blocks/null_source.h" %} -%include "blocks/annotator_1to1.h" -%include "blocks/annotator_alltoall.h" -%include "blocks/annotator_raw.h" -%include "blocks/control_loop.h" -%include "blocks/copy.h" -%include "blocks/delay.h" -%include "blocks/endian_swap.h" -%include "blocks/file_descriptor_sink.h" -%include "blocks/file_descriptor_source.h" -%include "blocks/file_sink_base.h" -%include "blocks/file_sink.h" -%include "blocks/file_source.h" -%include "blocks/file_meta_sink.h" -%include "blocks/file_meta_source.h" -%include "blocks/head.h" -%include "blocks/message_debug.h" -%include "blocks/message_sink.h" -%include "blocks/message_source.h" -%include "blocks/message_strobe.h" -%include "blocks/message_burst_source.h" -%include "blocks/nop.h" -%include "blocks/null_sink.h" -%include "blocks/null_source.h" -%include "blocks/skiphead.h" -%include "blocks/stream_mux.h" -%include "blocks/stream_to_streams.h" -%include "blocks/stream_to_vector.h" -%include "blocks/streams_to_stream.h" -%include "blocks/streams_to_vector.h" -%include "blocks/tag_debug.h" -%include "blocks/tagged_file_sink.h" -%include "blocks/throttle.h" -%include "blocks/vector_map.h" -%include "blocks/vector_to_stream.h" -%include "blocks/vector_to_streams.h" -%include "blocks/vector_insert_b.h" -%include "blocks/vector_insert_s.h" -%include "blocks/vector_insert_i.h" -%include "blocks/vector_insert_f.h" -%include "blocks/vector_insert_c.h" -%include "blocks/vector_sink_b.h" -%include "blocks/vector_sink_s.h" -%include "blocks/vector_sink_i.h" -%include "blocks/vector_sink_f.h" -%include "blocks/vector_sink_c.h" -%include "blocks/vector_source_b.h" -%include "blocks/vector_source_s.h" -%include "blocks/vector_source_i.h" -%include "blocks/vector_source_f.h" -%include "blocks/vector_source_c.h" -%include "blocks/wavfile_sink.h" -%include "blocks/wavfile_source.h" +%include "gnuradio/blocks/annotator_1to1.h" +%include "gnuradio/blocks/annotator_alltoall.h" +%include "gnuradio/blocks/annotator_raw.h" +%include "gnuradio/blocks/control_loop.h" +%include "gnuradio/blocks/copy.h" +%include "gnuradio/blocks/delay.h" +%include "gnuradio/blocks/endian_swap.h" +%include "gnuradio/blocks/file_descriptor_sink.h" +%include "gnuradio/blocks/file_descriptor_source.h" +%include "gnuradio/blocks/file_sink_base.h" +%include "gnuradio/blocks/file_sink.h" +%include "gnuradio/blocks/file_source.h" +%include "gnuradio/blocks/file_meta_sink.h" +%include "gnuradio/blocks/file_meta_source.h" +%include "gnuradio/blocks/head.h" +%include "gnuradio/blocks/message_debug.h" +%include "gnuradio/blocks/message_sink.h" +%include "gnuradio/blocks/message_source.h" +%include "gnuradio/blocks/message_strobe.h" +%include "gnuradio/blocks/message_burst_source.h" +%include "gnuradio/blocks/nop.h" +%include "gnuradio/blocks/null_sink.h" +%include "gnuradio/blocks/null_source.h" GR_SWIG_BLOCK_MAGIC2(blocks, annotator_1to1); GR_SWIG_BLOCK_MAGIC2(blocks, annotator_alltoall); @@ -158,45 +97,16 @@ GR_SWIG_BLOCK_MAGIC2(blocks, message_burst_source); GR_SWIG_BLOCK_MAGIC2(blocks, nop); GR_SWIG_BLOCK_MAGIC2(blocks, null_sink); GR_SWIG_BLOCK_MAGIC2(blocks, null_source); -GR_SWIG_BLOCK_MAGIC2(blocks, skiphead); -GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux); -GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams); -GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector); -GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream); -GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector); -GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, throttle); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_map); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f); -GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c); -GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source); #ifdef GR_CTRLPORT %{ -#include "blocks/ctrlport_probe_c.h" -#include "blocks/ctrlport_probe2_c.h" +#include "gnuradio/blocks/ctrlport_probe_c.h" +#include "gnuradio/blocks/ctrlport_probe2_c.h" %} -%include "blocks/ctrlport_probe_c.h" -%include "blocks/ctrlport_probe2_c.h" +%include "gnuradio/blocks/ctrlport_probe_c.h" +%include "gnuradio/blocks/ctrlport_probe2_c.h" GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe_c); GR_SWIG_BLOCK_MAGIC2(blocks, ctrlport_probe2_c); diff --git a/gr-blocks/swig/blocks_swig1.i b/gr-blocks/swig/blocks_swig1.i index 557afca97..328b2b1a0 100644 --- a/gr-blocks/swig/blocks_swig1.i +++ b/gr-blocks/swig/blocks_swig1.i @@ -24,250 +24,96 @@ %include "runtime_swig.i" -//load generated python docstrings %include "blocks_swig1_doc.i" %{ -#include "blocks/add_ff.h" -#include "blocks/add_ss.h" -#include "blocks/add_ii.h" -#include "blocks/add_cc.h" -#include "blocks/add_const_bb.h" -#include "blocks/add_const_ff.h" -#include "blocks/add_const_ss.h" -#include "blocks/add_const_ii.h" -#include "blocks/add_const_cc.h" -#include "blocks/add_const_vbb.h" -#include "blocks/add_const_vff.h" -#include "blocks/add_const_vss.h" -#include "blocks/add_const_vii.h" -#include "blocks/add_const_vcc.h" -#include "blocks/and_bb.h" -#include "blocks/and_ss.h" -#include "blocks/and_ii.h" -#include "blocks/and_const_bb.h" -#include "blocks/and_const_ss.h" -#include "blocks/and_const_ii.h" -#include "blocks/argmax_fs.h" -#include "blocks/argmax_is.h" -#include "blocks/argmax_ss.h" -#include "blocks/bin_statistics_f.h" -#include "blocks/burst_tagger.h" -#include "blocks/char_to_float.h" -#include "blocks/char_to_short.h" -#include "blocks/check_lfsr_32k_s.h" -#include "blocks/complex_to_interleaved_short.h" -#include "blocks/complex_to_float.h" -#include "blocks/complex_to_real.h" -#include "blocks/complex_to_imag.h" -#include "blocks/complex_to_mag.h" -#include "blocks/complex_to_mag_squared.h" -#include "blocks/complex_to_arg.h" -#include "blocks/conjugate_cc.h" -#include "blocks/deinterleave.h" -#include "blocks/divide_ff.h" -#include "blocks/divide_ss.h" -#include "blocks/divide_ii.h" -#include "blocks/divide_cc.h" -#include "blocks/float_to_char.h" -#include "blocks/float_to_complex.h" -#include "blocks/float_to_int.h" -#include "blocks/float_to_short.h" -#include "blocks/float_to_uchar.h" -#include "blocks/int_to_float.h" -#include "blocks/integrate_ss.h" -#include "blocks/integrate_ii.h" -#include "blocks/integrate_ff.h" -#include "blocks/integrate_cc.h" -#include "blocks/interleave.h" -#include "blocks/interleaved_short_to_complex.h" -#include "blocks/keep_m_in_n.h" -#include "blocks/keep_one_in_n.h" -#include "blocks/lfsr_32k_source_s.h" -#include "blocks/max_ff.h" -#include "blocks/max_ii.h" -#include "blocks/max_ss.h" -#include "blocks/moving_average_cc.h" -#include "blocks/moving_average_ff.h" -#include "blocks/moving_average_ii.h" -#include "blocks/moving_average_ss.h" -#include "blocks/multiply_ss.h" -#include "blocks/multiply_ii.h" -#include "blocks/multiply_ff.h" -#include "blocks/multiply_cc.h" -#include "blocks/multiply_conjugate_cc.h" -#include "blocks/multiply_const_ss.h" -#include "blocks/multiply_const_ii.h" -#include "blocks/multiply_const_ff.h" -#include "blocks/multiply_const_cc.h" -#include "blocks/multiply_const_vss.h" -#include "blocks/multiply_const_vii.h" -#include "blocks/multiply_const_vff.h" -#include "blocks/multiply_const_vcc.h" -#include "blocks/mute_ss.h" -#include "blocks/mute_ii.h" -#include "blocks/mute_ff.h" -#include "blocks/mute_cc.h" +#include "gnuradio/blocks/skiphead.h" +#include "gnuradio/blocks/stream_mux.h" +#include "gnuradio/blocks/stream_to_streams.h" +#include "gnuradio/blocks/stream_to_vector.h" +#include "gnuradio/blocks/streams_to_stream.h" +#include "gnuradio/blocks/streams_to_vector.h" +#include "gnuradio/blocks/tag_debug.h" +#include "gnuradio/blocks/tagged_file_sink.h" +#include "gnuradio/blocks/throttle.h" +#include "gnuradio/blocks/vector_map.h" +#include "gnuradio/blocks/vector_to_stream.h" +#include "gnuradio/blocks/vector_to_streams.h" +#include "gnuradio/blocks/vector_insert_b.h" +#include "gnuradio/blocks/vector_insert_s.h" +#include "gnuradio/blocks/vector_insert_i.h" +#include "gnuradio/blocks/vector_insert_f.h" +#include "gnuradio/blocks/vector_insert_c.h" +#include "gnuradio/blocks/vector_sink_b.h" +#include "gnuradio/blocks/vector_sink_s.h" +#include "gnuradio/blocks/vector_sink_i.h" +#include "gnuradio/blocks/vector_sink_f.h" +#include "gnuradio/blocks/vector_sink_c.h" +#include "gnuradio/blocks/vector_source_b.h" +#include "gnuradio/blocks/vector_source_s.h" +#include "gnuradio/blocks/vector_source_i.h" +#include "gnuradio/blocks/vector_source_f.h" +#include "gnuradio/blocks/vector_source_c.h" +#include "gnuradio/blocks/wavfile_sink.h" +#include "gnuradio/blocks/wavfile_source.h" %} -%include "blocks/add_ff.h" -%include "blocks/add_ss.h" -%include "blocks/add_ii.h" -%include "blocks/add_cc.h" -%include "blocks/add_const_bb.h" -%include "blocks/add_const_ff.h" -%include "blocks/add_const_ss.h" -%include "blocks/add_const_ii.h" -%include "blocks/add_const_cc.h" -%include "blocks/add_const_vbb.h" -%include "blocks/add_const_vff.h" -%include "blocks/add_const_vss.h" -%include "blocks/add_const_vii.h" -%include "blocks/add_const_vcc.h" -%include "blocks/and_bb.h" -%include "blocks/and_ss.h" -%include "blocks/and_ii.h" -%include "blocks/and_const_bb.h" -%include "blocks/and_const_ss.h" -%include "blocks/and_const_ii.h" -%include "blocks/argmax_fs.h" -%include "blocks/argmax_is.h" -%include "blocks/argmax_ss.h" -%include "blocks/char_to_float.h" -%include "blocks/bin_statistics_f.h" -%include "blocks/burst_tagger.h" -%include "blocks/char_to_short.h" -%include "blocks/check_lfsr_32k_s.h" -%include "blocks/complex_to_interleaved_short.h" -%include "blocks/complex_to_float.h" -%include "blocks/complex_to_real.h" -%include "blocks/complex_to_imag.h" -%include "blocks/complex_to_mag.h" -%include "blocks/complex_to_mag_squared.h" -%include "blocks/complex_to_arg.h" -%include "blocks/conjugate_cc.h" -%include "blocks/deinterleave.h" -%include "blocks/divide_ff.h" -%include "blocks/divide_ss.h" -%include "blocks/divide_ii.h" -%include "blocks/divide_cc.h" -%include "blocks/float_to_char.h" -%include "blocks/float_to_complex.h" -%include "blocks/float_to_int.h" -%include "blocks/float_to_short.h" -%include "blocks/float_to_uchar.h" -%include "blocks/int_to_float.h" -%include "blocks/integrate_ss.h" -%include "blocks/integrate_ii.h" -%include "blocks/integrate_ff.h" -%include "blocks/integrate_cc.h" -%include "blocks/interleave.h" -%include "blocks/interleaved_short_to_complex.h" -%include "blocks/keep_m_in_n.h" -%include "blocks/keep_one_in_n.h" -%include "blocks/lfsr_32k_source_s.h" -%include "blocks/max_ff.h" -%include "blocks/max_ii.h" -%include "blocks/max_ss.h" -%include "blocks/moving_average_cc.h" -%include "blocks/moving_average_ff.h" -%include "blocks/moving_average_ii.h" -%include "blocks/moving_average_ss.h" -%include "blocks/multiply_ss.h" -%include "blocks/multiply_ii.h" -%include "blocks/multiply_ff.h" -%include "blocks/multiply_cc.h" -%include "blocks/multiply_conjugate_cc.h" -%include "blocks/multiply_const_ss.h" -%include "blocks/multiply_const_ii.h" -%include "blocks/multiply_const_ff.h" -%include "blocks/multiply_const_cc.h" -%include "blocks/multiply_const_vss.h" -%include "blocks/multiply_const_vii.h" -%include "blocks/multiply_const_vff.h" -%include "blocks/multiply_const_vcc.h" -%include "blocks/mute_ss.h" -%include "blocks/mute_ii.h" -%include "blocks/mute_ff.h" -%include "blocks/mute_cc.h" +%include "gnuradio/blocks/skiphead.h" +%include "gnuradio/blocks/stream_mux.h" +%include "gnuradio/blocks/stream_to_streams.h" +%include "gnuradio/blocks/stream_to_vector.h" +%include "gnuradio/blocks/streams_to_stream.h" +%include "gnuradio/blocks/streams_to_vector.h" +%include "gnuradio/blocks/tag_debug.h" +%include "gnuradio/blocks/tagged_file_sink.h" +%include "gnuradio/blocks/throttle.h" +%include "gnuradio/blocks/vector_map.h" +%include "gnuradio/blocks/vector_to_stream.h" +%include "gnuradio/blocks/vector_to_streams.h" +%include "gnuradio/blocks/vector_insert_b.h" +%include "gnuradio/blocks/vector_insert_s.h" +%include "gnuradio/blocks/vector_insert_i.h" +%include "gnuradio/blocks/vector_insert_f.h" +%include "gnuradio/blocks/vector_insert_c.h" +%include "gnuradio/blocks/vector_sink_b.h" +%include "gnuradio/blocks/vector_sink_s.h" +%include "gnuradio/blocks/vector_sink_i.h" +%include "gnuradio/blocks/vector_sink_f.h" +%include "gnuradio/blocks/vector_sink_c.h" +%include "gnuradio/blocks/vector_source_b.h" +%include "gnuradio/blocks/vector_source_s.h" +%include "gnuradio/blocks/vector_source_i.h" +%include "gnuradio/blocks/vector_source_f.h" +%include "gnuradio/blocks/vector_source_c.h" +%include "gnuradio/blocks/wavfile_sink.h" +%include "gnuradio/blocks/wavfile_source.h" -GR_SWIG_BLOCK_MAGIC2(blocks, add_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, add_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, add_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, add_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii); -GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc); -GR_SWIG_BLOCK_MAGIC2(blocks, and_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, and_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, and_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, argmax_fs); -GR_SWIG_BLOCK_MAGIC2(blocks, argmax_is); -GR_SWIG_BLOCK_MAGIC2(blocks, argmax_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, bin_statistics_f); -GR_SWIG_BLOCK_MAGIC2(blocks, burst_tagger); -GR_SWIG_BLOCK_MAGIC2(blocks, char_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, char_to_short); -GR_SWIG_BLOCK_MAGIC2(blocks, check_lfsr_32k_s); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_interleaved_short); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_real); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_imag); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared); -GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg); -GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short); -GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar); -GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, interleave); -GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex); -GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n); -GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n); -GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s); -GR_SWIG_BLOCK_MAGIC2(blocks, max_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, max_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, max_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_conjugate_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vss); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vii); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vff); -GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vcc); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, mute_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, skiphead); +GR_SWIG_BLOCK_MAGIC2(blocks, stream_mux); +GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_streams); +GR_SWIG_BLOCK_MAGIC2(blocks, stream_to_vector); +GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_stream); +GR_SWIG_BLOCK_MAGIC2(blocks, streams_to_vector); +GR_SWIG_BLOCK_MAGIC2(blocks, tag_debug); +GR_SWIG_BLOCK_MAGIC2(blocks, tagged_file_sink); +GR_SWIG_BLOCK_MAGIC2(blocks, throttle); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_map); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_stream); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_to_streams); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_b); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_s); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_i); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_f); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_insert_c); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_b); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_s); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_i); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_f); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_sink_c); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_b); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_s); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_i); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_f); +GR_SWIG_BLOCK_MAGIC2(blocks, vector_source_c); +GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_sink); +GR_SWIG_BLOCK_MAGIC2(blocks, wavfile_source); diff --git a/gr-blocks/swig/blocks_swig2.i b/gr-blocks/swig/blocks_swig2.i index bfc1075cd..d41b3f02a 100644 --- a/gr-blocks/swig/blocks_swig2.i +++ b/gr-blocks/swig/blocks_swig2.i @@ -23,203 +23,134 @@ #define BLOCKS_API %include "runtime_swig.i" -%include "blocks/pdu.h" - -%include <gr_endianness.h> //load generated python docstrings -%include "blocks_swig1_doc.i" +%include "blocks_swig2_doc.i" %{ -#include "blocks/nlog10_ff.h" -#include "blocks/not_bb.h" -#include "blocks/not_ss.h" -#include "blocks/not_ii.h" -#include "blocks/patterned_interleaver.h" -#include "blocks/pack_k_bits_bb.h" -#include "blocks/packed_to_unpacked_bb.h" -#include "blocks/packed_to_unpacked_ss.h" -#include "blocks/packed_to_unpacked_ii.h" -#include "blocks/pdu_to_tagged_stream.h" -#include "blocks/peak_detector_fb.h" -#include "blocks/peak_detector_ib.h" -#include "blocks/peak_detector_sb.h" -#include "blocks/peak_detector2_fb.h" -#include "blocks/plateau_detector_fb.h" -#include "blocks/probe_rate.h" -#include "blocks/probe_signal_b.h" -#include "blocks/probe_signal_s.h" -#include "blocks/probe_signal_i.h" -#include "blocks/probe_signal_f.h" -#include "blocks/probe_signal_c.h" -#include "blocks/probe_signal_vb.h" -#include "blocks/probe_signal_vs.h" -#include "blocks/probe_signal_vi.h" -#include "blocks/probe_signal_vf.h" -#include "blocks/probe_signal_vc.h" -#include "blocks/or_bb.h" -#include "blocks/or_ss.h" -#include "blocks/or_ii.h" -#include "blocks/random_pdu.h" -#include "blocks/regenerate_bb.h" -#include "blocks/repack_bits_bb.h" -#include "blocks/repeat.h" -#include "blocks/rms_cf.h" -#include "blocks/rms_ff.h" -#include "blocks/sample_and_hold_bb.h" -#include "blocks/sample_and_hold_ss.h" -#include "blocks/sample_and_hold_ii.h" -#include "blocks/sample_and_hold_ff.h" -#include "blocks/short_to_char.h" -#include "blocks/short_to_float.h" -#include "blocks/socket_pdu.h" -#include "blocks/stretch_ff.h" -#include "blocks/sub_ff.h" -#include "blocks/sub_ss.h" -#include "blocks/sub_ii.h" -#include "blocks/sub_cc.h" -#include "blocks/tagged_stream_mux.h" -#include "blocks/tagged_stream_to_pdu.h" -#include "blocks/threshold_ff.h" -#include "blocks/transcendental.h" -#include "blocks/tuntap_pdu.h" -#include "blocks/uchar_to_float.h" -#include "blocks/udp_sink.h" -#include "blocks/udp_source.h" -#include "blocks/unpack_k_bits_bb.h" -#include "blocks/unpacked_to_packed_bb.h" -#include "blocks/unpacked_to_packed_ss.h" -#include "blocks/unpacked_to_packed_ii.h" -#include "blocks/vco_f.h" -#include "blocks/xor_bb.h" -#include "blocks/xor_ss.h" -#include "blocks/xor_ii.h" +#include "gnuradio/blocks/add_ff.h" +#include "gnuradio/blocks/add_ss.h" +#include "gnuradio/blocks/add_ii.h" +#include "gnuradio/blocks/add_cc.h" +#include "gnuradio/blocks/add_const_bb.h" +#include "gnuradio/blocks/add_const_ff.h" +#include "gnuradio/blocks/add_const_ss.h" +#include "gnuradio/blocks/add_const_ii.h" +#include "gnuradio/blocks/add_const_cc.h" +#include "gnuradio/blocks/add_const_vbb.h" +#include "gnuradio/blocks/add_const_vff.h" +#include "gnuradio/blocks/add_const_vss.h" +#include "gnuradio/blocks/add_const_vii.h" +#include "gnuradio/blocks/add_const_vcc.h" +#include "gnuradio/blocks/and_bb.h" +#include "gnuradio/blocks/and_ss.h" +#include "gnuradio/blocks/and_ii.h" +#include "gnuradio/blocks/and_const_bb.h" +#include "gnuradio/blocks/and_const_ss.h" +#include "gnuradio/blocks/and_const_ii.h" +#include "gnuradio/blocks/argmax_fs.h" +#include "gnuradio/blocks/argmax_is.h" +#include "gnuradio/blocks/argmax_ss.h" +#include "gnuradio/blocks/bin_statistics_f.h" +#include "gnuradio/blocks/burst_tagger.h" +#include "gnuradio/blocks/char_to_float.h" +#include "gnuradio/blocks/char_to_short.h" +#include "gnuradio/blocks/check_lfsr_32k_s.h" +#include "gnuradio/blocks/complex_to_interleaved_short.h" +#include "gnuradio/blocks/complex_to_float.h" +#include "gnuradio/blocks/complex_to_real.h" +#include "gnuradio/blocks/complex_to_imag.h" +#include "gnuradio/blocks/complex_to_mag.h" +#include "gnuradio/blocks/complex_to_mag_squared.h" +#include "gnuradio/blocks/complex_to_arg.h" +#include "gnuradio/blocks/conjugate_cc.h" +#include "gnuradio/blocks/deinterleave.h" +#include "gnuradio/blocks/divide_ff.h" +#include "gnuradio/blocks/divide_ss.h" +#include "gnuradio/blocks/divide_ii.h" +#include "gnuradio/blocks/divide_cc.h" %} -%include "blocks/nlog10_ff.h" -%include "blocks/not_bb.h" -%include "blocks/not_ss.h" -%include "blocks/not_ii.h" -%include "blocks/probe_signal_b.h" -%include "blocks/probe_signal_s.h" -%include "blocks/probe_signal_i.h" -%include "blocks/probe_signal_f.h" -%include "blocks/probe_signal_c.h" -%include "blocks/probe_signal_vb.h" -%include "blocks/probe_signal_vs.h" -%include "blocks/probe_signal_vi.h" -%include "blocks/probe_signal_vf.h" -%include "blocks/probe_signal_vc.h" -%include "blocks/or_bb.h" -%include "blocks/or_ss.h" -%include "blocks/or_ii.h" -%include "blocks/pack_k_bits_bb.h" -%include "blocks/packed_to_unpacked_bb.h" -%include "blocks/packed_to_unpacked_ss.h" -%include "blocks/packed_to_unpacked_ii.h" -%include "blocks/patterned_interleaver.h" -%include "blocks/pdu_to_tagged_stream.h" -%include "blocks/peak_detector_fb.h" -%include "blocks/peak_detector_ib.h" -%include "blocks/peak_detector_sb.h" -%include "blocks/peak_detector2_fb.h" -%include "blocks/plateau_detector_fb.h" -%include "blocks/probe_rate.h" -%include "blocks/random_pdu.h" -%include "blocks/regenerate_bb.h" -%include "blocks/repack_bits_bb.h" -%include "blocks/repeat.h" -%include "blocks/rms_cf.h" -%include "blocks/rms_ff.h" -%include "blocks/sample_and_hold_bb.h" -%include "blocks/sample_and_hold_ss.h" -%include "blocks/sample_and_hold_ii.h" -%include "blocks/sample_and_hold_ff.h" -%include "blocks/short_to_char.h" -%include "blocks/short_to_float.h" -%include "blocks/socket_pdu.h" -%include "blocks/stretch_ff.h" -%include "blocks/sub_ff.h" -%include "blocks/sub_ss.h" -%include "blocks/sub_ii.h" -%include "blocks/sub_cc.h" -%include "blocks/tagged_stream_mux.h" -%include "blocks/tagged_stream_to_pdu.h" -%include "blocks/threshold_ff.h" -%include "blocks/transcendental.h" -%include "blocks/tuntap_pdu.h" -%include "blocks/uchar_to_float.h" -%include "blocks/udp_sink.h" -%include "blocks/udp_source.h" -%include "blocks/unpack_k_bits_bb.h" -%include "blocks/unpacked_to_packed_bb.h" -%include "blocks/unpacked_to_packed_ss.h" -%include "blocks/unpacked_to_packed_ii.h" -%include "blocks/vco_f.h" -%include "blocks/xor_bb.h" -%include "blocks/xor_ss.h" -%include "blocks/xor_ii.h" +%include "gnuradio/blocks/add_ff.h" +%include "gnuradio/blocks/add_ss.h" +%include "gnuradio/blocks/add_ii.h" +%include "gnuradio/blocks/add_cc.h" +%include "gnuradio/blocks/add_const_bb.h" +%include "gnuradio/blocks/add_const_ff.h" +%include "gnuradio/blocks/add_const_ss.h" +%include "gnuradio/blocks/add_const_ii.h" +%include "gnuradio/blocks/add_const_cc.h" +%include "gnuradio/blocks/add_const_vbb.h" +%include "gnuradio/blocks/add_const_vff.h" +%include "gnuradio/blocks/add_const_vss.h" +%include "gnuradio/blocks/add_const_vii.h" +%include "gnuradio/blocks/add_const_vcc.h" +%include "gnuradio/blocks/and_bb.h" +%include "gnuradio/blocks/and_ss.h" +%include "gnuradio/blocks/and_ii.h" +%include "gnuradio/blocks/and_const_bb.h" +%include "gnuradio/blocks/and_const_ss.h" +%include "gnuradio/blocks/and_const_ii.h" +%include "gnuradio/blocks/argmax_fs.h" +%include "gnuradio/blocks/argmax_is.h" +%include "gnuradio/blocks/argmax_ss.h" +%include "gnuradio/blocks/char_to_float.h" +%include "gnuradio/blocks/bin_statistics_f.h" +%include "gnuradio/blocks/burst_tagger.h" +%include "gnuradio/blocks/char_to_short.h" +%include "gnuradio/blocks/check_lfsr_32k_s.h" +%include "gnuradio/blocks/complex_to_interleaved_short.h" +%include "gnuradio/blocks/complex_to_float.h" +%include "gnuradio/blocks/complex_to_real.h" +%include "gnuradio/blocks/complex_to_imag.h" +%include "gnuradio/blocks/complex_to_mag.h" +%include "gnuradio/blocks/complex_to_mag_squared.h" +%include "gnuradio/blocks/complex_to_arg.h" +%include "gnuradio/blocks/conjugate_cc.h" +%include "gnuradio/blocks/deinterleave.h" +%include "gnuradio/blocks/divide_ff.h" +%include "gnuradio/blocks/divide_ss.h" +%include "gnuradio/blocks/divide_ii.h" +%include "gnuradio/blocks/divide_cc.h" -GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, not_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, not_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, not_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver); -GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb); -GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb); -GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb); -GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate); -GR_SWIG_BLOCK_MAGIC2(blocks, or_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, or_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, or_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_f); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_c); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vb); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vs); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vi); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vf); -GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vc); -GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, repeat); -GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf); -GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char); -GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux); -GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff); -GR_SWIG_BLOCK_MAGIC2(blocks, transcendental); -GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu); -GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float); -GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink); -GR_SWIG_BLOCK_MAGIC2(blocks, udp_source); -GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii); -GR_SWIG_BLOCK_MAGIC2(blocks, vco_f); -GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb); -GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss); -GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, add_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, add_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, add_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, add_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vbb); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vff); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vss); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vii); +GR_SWIG_BLOCK_MAGIC2(blocks, add_const_vcc); +GR_SWIG_BLOCK_MAGIC2(blocks, and_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, and_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, and_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, and_const_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, and_const_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, argmax_fs); +GR_SWIG_BLOCK_MAGIC2(blocks, argmax_is); +GR_SWIG_BLOCK_MAGIC2(blocks, argmax_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, bin_statistics_f); +GR_SWIG_BLOCK_MAGIC2(blocks, burst_tagger); +GR_SWIG_BLOCK_MAGIC2(blocks, char_to_float); +GR_SWIG_BLOCK_MAGIC2(blocks, char_to_short); +GR_SWIG_BLOCK_MAGIC2(blocks, check_lfsr_32k_s); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_interleaved_short); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_float); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_real); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_imag); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_mag_squared); +GR_SWIG_BLOCK_MAGIC2(blocks, complex_to_arg); +GR_SWIG_BLOCK_MAGIC2(blocks, conjugate_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, deinterleave); +GR_SWIG_BLOCK_MAGIC2(blocks, divide_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, divide_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc); diff --git a/gr-blocks/swig/blocks_swig3.i b/gr-blocks/swig/blocks_swig3.i new file mode 100644 index 000000000..bfa2e68a4 --- /dev/null +++ b/gr-blocks/swig/blocks_swig3.i @@ -0,0 +1,150 @@ +/* -*- c++ -*- */ +/* + * Copyright 2012-2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#define BLOCKS_API + +%include "runtime_swig.i" + +//load generated python docstrings +%include "blocks_swig3_doc.i" + +%{ +#include "gnuradio/blocks/float_to_char.h" +#include "gnuradio/blocks/float_to_complex.h" +#include "gnuradio/blocks/float_to_int.h" +#include "gnuradio/blocks/float_to_short.h" +#include "gnuradio/blocks/float_to_uchar.h" +#include "gnuradio/blocks/int_to_float.h" +#include "gnuradio/blocks/integrate_ss.h" +#include "gnuradio/blocks/integrate_ii.h" +#include "gnuradio/blocks/integrate_ff.h" +#include "gnuradio/blocks/integrate_cc.h" +#include "gnuradio/blocks/interleave.h" +#include "gnuradio/blocks/interleaved_short_to_complex.h" +#include "gnuradio/blocks/keep_m_in_n.h" +#include "gnuradio/blocks/keep_one_in_n.h" +#include "gnuradio/blocks/lfsr_32k_source_s.h" +#include "gnuradio/blocks/max_ff.h" +#include "gnuradio/blocks/max_ii.h" +#include "gnuradio/blocks/max_ss.h" +#include "gnuradio/blocks/moving_average_cc.h" +#include "gnuradio/blocks/moving_average_ff.h" +#include "gnuradio/blocks/moving_average_ii.h" +#include "gnuradio/blocks/moving_average_ss.h" +#include "gnuradio/blocks/multiply_ss.h" +#include "gnuradio/blocks/multiply_ii.h" +#include "gnuradio/blocks/multiply_ff.h" +#include "gnuradio/blocks/multiply_cc.h" +#include "gnuradio/blocks/multiply_conjugate_cc.h" +#include "gnuradio/blocks/multiply_const_ss.h" +#include "gnuradio/blocks/multiply_const_ii.h" +#include "gnuradio/blocks/multiply_const_ff.h" +#include "gnuradio/blocks/multiply_const_cc.h" +#include "gnuradio/blocks/multiply_const_vss.h" +#include "gnuradio/blocks/multiply_const_vii.h" +#include "gnuradio/blocks/multiply_const_vff.h" +#include "gnuradio/blocks/multiply_const_vcc.h" +#include "gnuradio/blocks/mute_ss.h" +#include "gnuradio/blocks/mute_ii.h" +#include "gnuradio/blocks/mute_ff.h" +#include "gnuradio/blocks/mute_cc.h" +%} + +%include "gnuradio/blocks/float_to_char.h" +%include "gnuradio/blocks/float_to_complex.h" +%include "gnuradio/blocks/float_to_int.h" +%include "gnuradio/blocks/float_to_short.h" +%include "gnuradio/blocks/float_to_uchar.h" +%include "gnuradio/blocks/int_to_float.h" +%include "gnuradio/blocks/integrate_ss.h" +%include "gnuradio/blocks/integrate_ii.h" +%include "gnuradio/blocks/integrate_ff.h" +%include "gnuradio/blocks/integrate_cc.h" +%include "gnuradio/blocks/interleave.h" +%include "gnuradio/blocks/interleaved_short_to_complex.h" +%include "gnuradio/blocks/keep_m_in_n.h" +%include "gnuradio/blocks/keep_one_in_n.h" +%include "gnuradio/blocks/lfsr_32k_source_s.h" +%include "gnuradio/blocks/max_ff.h" +%include "gnuradio/blocks/max_ii.h" +%include "gnuradio/blocks/max_ss.h" +%include "gnuradio/blocks/moving_average_cc.h" +%include "gnuradio/blocks/moving_average_ff.h" +%include "gnuradio/blocks/moving_average_ii.h" +%include "gnuradio/blocks/moving_average_ss.h" +%include "gnuradio/blocks/multiply_ss.h" +%include "gnuradio/blocks/multiply_ii.h" +%include "gnuradio/blocks/multiply_ff.h" +%include "gnuradio/blocks/multiply_cc.h" +%include "gnuradio/blocks/multiply_conjugate_cc.h" +%include "gnuradio/blocks/multiply_const_ss.h" +%include "gnuradio/blocks/multiply_const_ii.h" +%include "gnuradio/blocks/multiply_const_ff.h" +%include "gnuradio/blocks/multiply_const_cc.h" +%include "gnuradio/blocks/multiply_const_vss.h" +%include "gnuradio/blocks/multiply_const_vii.h" +%include "gnuradio/blocks/multiply_const_vff.h" +%include "gnuradio/blocks/multiply_const_vcc.h" +%include "gnuradio/blocks/mute_ss.h" +%include "gnuradio/blocks/mute_ii.h" +%include "gnuradio/blocks/mute_ff.h" +%include "gnuradio/blocks/mute_cc.h" + +GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char); +GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex); +GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int); +GR_SWIG_BLOCK_MAGIC2(blocks, float_to_short); +GR_SWIG_BLOCK_MAGIC2(blocks, float_to_uchar); +GR_SWIG_BLOCK_MAGIC2(blocks, int_to_float); +GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, integrate_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, integrate_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, interleave); +GR_SWIG_BLOCK_MAGIC2(blocks, interleaved_short_to_complex); +GR_SWIG_BLOCK_MAGIC2(blocks, keep_m_in_n); +GR_SWIG_BLOCK_MAGIC2(blocks, keep_one_in_n); +GR_SWIG_BLOCK_MAGIC2(blocks, lfsr_32k_source_s); +GR_SWIG_BLOCK_MAGIC2(blocks, max_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, max_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, max_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, moving_average_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_conjugate_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vss); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vii); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vff); +GR_SWIG_BLOCK_MAGIC2(blocks, multiply_const_vcc); +GR_SWIG_BLOCK_MAGIC2(blocks, mute_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, mute_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, mute_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, mute_cc); diff --git a/gr-blocks/swig/blocks_swig4.i b/gr-blocks/swig/blocks_swig4.i new file mode 100644 index 000000000..ecd63dd3a --- /dev/null +++ b/gr-blocks/swig/blocks_swig4.i @@ -0,0 +1,123 @@ +/* -*- c++ -*- */ +/* + * Copyright 2012-2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#define BLOCKS_API + +%include "runtime_swig.i" +%include "gnuradio/blocks/pdu.h" + +%include <gnuradio/endianness.h> + +//load generated python docstrings +%include "blocks_swig4_doc.i" + +%{ +#include "gnuradio/blocks/nlog10_ff.h" +#include "gnuradio/blocks/not_bb.h" +#include "gnuradio/blocks/not_ss.h" +#include "gnuradio/blocks/not_ii.h" +#include "gnuradio/blocks/patterned_interleaver.h" +#include "gnuradio/blocks/pack_k_bits_bb.h" +#include "gnuradio/blocks/packed_to_unpacked_bb.h" +#include "gnuradio/blocks/packed_to_unpacked_ss.h" +#include "gnuradio/blocks/packed_to_unpacked_ii.h" +#include "gnuradio/blocks/pdu_to_tagged_stream.h" +#include "gnuradio/blocks/peak_detector_fb.h" +#include "gnuradio/blocks/peak_detector_ib.h" +#include "gnuradio/blocks/peak_detector_sb.h" +#include "gnuradio/blocks/peak_detector2_fb.h" +#include "gnuradio/blocks/plateau_detector_fb.h" +#include "gnuradio/blocks/probe_rate.h" +#include "gnuradio/blocks/probe_signal_b.h" +#include "gnuradio/blocks/probe_signal_s.h" +#include "gnuradio/blocks/probe_signal_i.h" +#include "gnuradio/blocks/probe_signal_f.h" +#include "gnuradio/blocks/probe_signal_c.h" +#include "gnuradio/blocks/probe_signal_vb.h" +#include "gnuradio/blocks/probe_signal_vs.h" +#include "gnuradio/blocks/probe_signal_vi.h" +#include "gnuradio/blocks/probe_signal_vf.h" +#include "gnuradio/blocks/probe_signal_vc.h" +#include "gnuradio/blocks/or_bb.h" +#include "gnuradio/blocks/or_ss.h" +#include "gnuradio/blocks/or_ii.h" +%} + +%include "gnuradio/blocks/nlog10_ff.h" +%include "gnuradio/blocks/not_bb.h" +%include "gnuradio/blocks/not_ss.h" +%include "gnuradio/blocks/not_ii.h" +%include "gnuradio/blocks/probe_signal_b.h" +%include "gnuradio/blocks/probe_signal_s.h" +%include "gnuradio/blocks/probe_signal_i.h" +%include "gnuradio/blocks/probe_signal_f.h" +%include "gnuradio/blocks/probe_signal_c.h" +%include "gnuradio/blocks/probe_signal_vb.h" +%include "gnuradio/blocks/probe_signal_vs.h" +%include "gnuradio/blocks/probe_signal_vi.h" +%include "gnuradio/blocks/probe_signal_vf.h" +%include "gnuradio/blocks/probe_signal_vc.h" +%include "gnuradio/blocks/or_bb.h" +%include "gnuradio/blocks/or_ss.h" +%include "gnuradio/blocks/or_ii.h" +%include "gnuradio/blocks/pack_k_bits_bb.h" +%include "gnuradio/blocks/packed_to_unpacked_bb.h" +%include "gnuradio/blocks/packed_to_unpacked_ss.h" +%include "gnuradio/blocks/packed_to_unpacked_ii.h" +%include "gnuradio/blocks/patterned_interleaver.h" +%include "gnuradio/blocks/pdu_to_tagged_stream.h" +%include "gnuradio/blocks/peak_detector_fb.h" +%include "gnuradio/blocks/peak_detector_ib.h" +%include "gnuradio/blocks/peak_detector_sb.h" +%include "gnuradio/blocks/peak_detector2_fb.h" +%include "gnuradio/blocks/plateau_detector_fb.h" +%include "gnuradio/blocks/probe_rate.h" + +GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, not_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, not_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, not_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver); +GR_SWIG_BLOCK_MAGIC2(blocks, pack_k_bits_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, packed_to_unpacked_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_fb); +GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_ib); +GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector_sb); +GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb); +GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb); +GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate); +GR_SWIG_BLOCK_MAGIC2(blocks, or_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, or_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, or_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_b); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_s); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_i); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_f); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_c); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vb); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vs); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vi); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vf); +GR_SWIG_BLOCK_MAGIC2(blocks, probe_signal_vc); diff --git a/gr-blocks/swig/blocks_swig5.i b/gr-blocks/swig/blocks_swig5.i new file mode 100644 index 000000000..c04af1ed7 --- /dev/null +++ b/gr-blocks/swig/blocks_swig5.i @@ -0,0 +1,141 @@ +/* -*- c++ -*- */ +/* + * Copyright 2012-2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#define BLOCKS_API + +%include "runtime_swig.i" +%include "gnuradio/blocks/pdu.h" + +%include <gnuradio/endianness.h> + +//load generated python docstrings +%include "blocks_swig5_doc.i" + +%{ +#include "gnuradio/blocks/random_pdu.h" +#include "gnuradio/blocks/regenerate_bb.h" +#include "gnuradio/blocks/repack_bits_bb.h" +#include "gnuradio/blocks/repeat.h" +#include "gnuradio/blocks/rms_cf.h" +#include "gnuradio/blocks/rms_ff.h" +#include "gnuradio/blocks/sample_and_hold_bb.h" +#include "gnuradio/blocks/sample_and_hold_ss.h" +#include "gnuradio/blocks/sample_and_hold_ii.h" +#include "gnuradio/blocks/sample_and_hold_ff.h" +#include "gnuradio/blocks/short_to_char.h" +#include "gnuradio/blocks/short_to_float.h" +#include "gnuradio/blocks/socket_pdu.h" +#include "gnuradio/blocks/stretch_ff.h" +#include "gnuradio/blocks/sub_ff.h" +#include "gnuradio/blocks/sub_ss.h" +#include "gnuradio/blocks/sub_ii.h" +#include "gnuradio/blocks/sub_cc.h" +#include "gnuradio/blocks/tag_gate.h" +#include "gnuradio/blocks/tagged_stream_mux.h" +#include "gnuradio/blocks/tagged_stream_to_pdu.h" +#include "gnuradio/blocks/threshold_ff.h" +#include "gnuradio/blocks/transcendental.h" +#include "gnuradio/blocks/tuntap_pdu.h" +#include "gnuradio/blocks/uchar_to_float.h" +#include "gnuradio/blocks/udp_sink.h" +#include "gnuradio/blocks/udp_source.h" +#include "gnuradio/blocks/unpack_k_bits_bb.h" +#include "gnuradio/blocks/unpacked_to_packed_bb.h" +#include "gnuradio/blocks/unpacked_to_packed_ss.h" +#include "gnuradio/blocks/unpacked_to_packed_ii.h" +#include "gnuradio/blocks/vco_f.h" +#include "gnuradio/blocks/xor_bb.h" +#include "gnuradio/blocks/xor_ss.h" +#include "gnuradio/blocks/xor_ii.h" +%} + +%include "gnuradio/blocks/random_pdu.h" +%include "gnuradio/blocks/regenerate_bb.h" +%include "gnuradio/blocks/repack_bits_bb.h" +%include "gnuradio/blocks/repeat.h" +%include "gnuradio/blocks/rms_cf.h" +%include "gnuradio/blocks/rms_ff.h" +%include "gnuradio/blocks/sample_and_hold_bb.h" +%include "gnuradio/blocks/sample_and_hold_ss.h" +%include "gnuradio/blocks/sample_and_hold_ii.h" +%include "gnuradio/blocks/sample_and_hold_ff.h" +%include "gnuradio/blocks/short_to_char.h" +%include "gnuradio/blocks/short_to_float.h" +%include "gnuradio/blocks/socket_pdu.h" +%include "gnuradio/blocks/stretch_ff.h" +%include "gnuradio/blocks/sub_ff.h" +%include "gnuradio/blocks/sub_ss.h" +%include "gnuradio/blocks/sub_ii.h" +%include "gnuradio/blocks/sub_cc.h" +%include "gnuradio/blocks/tag_gate.h" +%include "gnuradio/blocks/tagged_stream_mux.h" +%include "gnuradio/blocks/tagged_stream_to_pdu.h" +%include "gnuradio/blocks/threshold_ff.h" +%include "gnuradio/blocks/transcendental.h" +%include "gnuradio/blocks/tuntap_pdu.h" +%include "gnuradio/blocks/uchar_to_float.h" +%include "gnuradio/blocks/udp_sink.h" +%include "gnuradio/blocks/udp_source.h" +%include "gnuradio/blocks/unpack_k_bits_bb.h" +%include "gnuradio/blocks/unpacked_to_packed_bb.h" +%include "gnuradio/blocks/unpacked_to_packed_ss.h" +%include "gnuradio/blocks/unpacked_to_packed_ii.h" +%include "gnuradio/blocks/vco_f.h" +%include "gnuradio/blocks/xor_bb.h" +%include "gnuradio/blocks/xor_ss.h" +%include "gnuradio/blocks/xor_ii.h" + +GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu); +GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, repeat); +GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf); +GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, short_to_char); +GR_SWIG_BLOCK_MAGIC2(blocks, short_to_float); +GR_SWIG_BLOCK_MAGIC2(blocks, socket_pdu); +GR_SWIG_BLOCK_MAGIC2(blocks, stretch_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, sub_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, sub_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, sub_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, sub_cc); +GR_SWIG_BLOCK_MAGIC2(blocks, tag_gate); +GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_mux); +GR_SWIG_BLOCK_MAGIC2(blocks, tagged_stream_to_pdu); +GR_SWIG_BLOCK_MAGIC2(blocks, threshold_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, transcendental); +GR_SWIG_BLOCK_MAGIC2(blocks, tuntap_pdu); +GR_SWIG_BLOCK_MAGIC2(blocks, uchar_to_float); +GR_SWIG_BLOCK_MAGIC2(blocks, udp_sink); +GR_SWIG_BLOCK_MAGIC2(blocks, udp_source); +GR_SWIG_BLOCK_MAGIC2(blocks, unpack_k_bits_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, unpacked_to_packed_ii); +GR_SWIG_BLOCK_MAGIC2(blocks, vco_f); +GR_SWIG_BLOCK_MAGIC2(blocks, xor_bb); +GR_SWIG_BLOCK_MAGIC2(blocks, xor_ss); +GR_SWIG_BLOCK_MAGIC2(blocks, xor_ii); diff --git a/gr-blocks/tests/benchmark_nco.cc b/gr-blocks/tests/benchmark_nco.cc index 4c2ed120d..593972494 100644 --- a/gr-blocks/tests/benchmark_nco.cc +++ b/gr-blocks/tests/benchmark_nco.cc @@ -33,8 +33,8 @@ #endif #include <unistd.h> -#include <blocks/nco.h> -#include <blocks/fxpt_nco.h> +#include <gnuradio/blocks/nco.h> +#include <gnuradio/blocks/fxpt_nco.h> #include <string.h> #define ITERATIONS 20000000 diff --git a/gr-blocks/tests/benchmark_vco.cc b/gr-blocks/tests/benchmark_vco.cc index 955dc0805..865e36df4 100644 --- a/gr-blocks/tests/benchmark_vco.cc +++ b/gr-blocks/tests/benchmark_vco.cc @@ -33,8 +33,8 @@ #endif #include <unistd.h> -#include <blocks/vco.h> -#include <blocks/fxpt_vco.h> +#include <gnuradio/blocks/vco.h> +#include <gnuradio/blocks/fxpt_vco.h> #include <string.h> #define ITERATIONS 5000000 |