diff options
Diffstat (limited to 'gr-blocks/lib')
275 files changed, 1178 insertions, 1036 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index bdd7ca77a6..34453bca50 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 c528e2fbff..281dcea050 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 2e20ef5fe3..22292b9fa5 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 7fa883f4bb..87b22452dc 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 cae5ca8135..e0c2ae54bc 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 da76cfeef2..3a7174a4ef 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 a7a6197258..6c087d9461 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 83359ef804..e12e86c061 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 77b90d0795..237ca37217 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 3218a8c746..04d6dfe862 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 25f0da0c85..f7db3f2162 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 8ff5ac3713..8eba4ed588 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 2c379feb84..186fda9508 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 e7f105fc02..04f9a2f458 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 3306602e2c..2da73c8a66 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 4909f7f820..cedf8dd44f 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 24c21948bc..81b73a8972 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 ee5deb1f6b..499168c275 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 e0e16c30d6..54bed2ea25 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 56673ef995..87e025e2d7 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 0f1643f6b9..79da4e1d82 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 014222a63d..1f17e85365 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 0abb60ed38..1d8da6b348 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 31c535290d..da69a0ea48 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 80bdec12fb..65ad58f8b3 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 22c5d2e252..de6ee5ba5a 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 620d7e7371..f5677f86bd 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 a86a928b51..2b5414d673 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 efd3ab3a8c..1009defedc 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 5664067591..fac30223f7 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 f6d3c8daa2..e060e89afc 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 87ac9966f0..38539c8004 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 9ccfba05ae..cc1863b2d8 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 3c1109de5f..d0b2bc6b9c 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 d90ac28d58..d4fdcb7a9b 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 760440cc9d..27d349aa1d 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 e647e67732..6758b0f6c5 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 2f2ea6e00d..87146364bc 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 9a09d1ff99..7bcea95be0 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 419bc53eb1..52a193f4d1 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 fe6da3f15e..54f12ac312 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 a3b48b153e..513527c25a 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 01851d2661..0cf22c8d9b 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 6f053b669a..06d1b5ab0e 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 7d4d4306f8..233f90c93d 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 3d46bef68b..14fbbf172c 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 448e7b3188..d3d0f9a0b7 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 44f4e53394..bd33e6a7a0 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 929f22b7d3..564ea09ef4 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 1f0f1a655e..5f3c81a306 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 167396b575..c65dc94894 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 f52e605a0d..bc6febdb2d 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 4d290a4e8f..c58d97f078 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 e11bd0496e..1c077af481 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 5d9073ac10..59e9497a82 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 badf4973a6..6866cc7acb 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 762c9d5fe0..d4d9392e8a 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 08cd1db1c3..197aa66977 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 1cb959359e..ad07e6aa78 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 223d6ad905..30cb3ab38c 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 a1c486b859..2680ef7012 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 7e67c30147..3c263e40a3 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 517df44f17..ab8fff1b65 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 a1f26220d2..975c60c63d 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 90b02f4163..0b455879a4 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 667e96b7fa..575681ba9b 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 dd86e18af1..6bdfa03614 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 dc87a7e956..82ecb93db3 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 d4048e1e4e..e454341f62 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 2b16b9066b..6f1338dd58 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 3f8ebda6ee..00d8d7e86f 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 d3a36f3321..42e2eae528 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 88dcb5a021..e78576e288 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 8e802ad88a..f86009419e 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 3c30884a59..d413995549 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 fc7f8053df..5f5e8c9340 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 943736d7ee..6a528d797a 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 defed8e3e4..2cc3993d50 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 c37522dc95..cec95cb66b 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 2644f3e709..a5435d9960 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 709aa420c3..f37f2bb7a6 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 859c5bf965..d28beb2697 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 24218ab682..04db8bed2f 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 71775fcb1c..d437b50cfa 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 2807ae1927..6c6b5607a9 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 5427862b38..2ca5a3bf04 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 22d0527b1c..a55b3dbc82 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 effd66c5cc..56e815c511 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 7dfa36607c..4c33f9f08e 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 a56acfbb27..fe2918c404 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 0190d7ccb0..306a6f169d 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 7498a0bb13..96b416be1d 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 4c82729e3c..2def0309df 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 9fc3333882..e37ddc077d 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 df37ed26d6..1f68cfc512 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 a02517e3e1..962747c8b5 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 3f20fdb989..33f70ccdfa 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 9a28d9c974..962b29b37c 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 4d027b7b5c..3280f894fd 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 312b09c253..8ce7a81d80 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 0b8819489a..ffb580bb3a 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 7ab6dc14de..34012dd59a 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 1588fb1a61..4138f164a1 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 738e732b49..58b0ad7def 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 b8c684e8d6..40fc6b6d84 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 669e2fd30d..21ce85e8ec 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 0f1643f6b9..79da4e1d82 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 5ac417f7a5..573959e027 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 2d5e6a974f..ceb0985e65 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 04f31f88a2..3f7c6ef097 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 817a9a834c..5a6e2e4acb 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 fbc7b27d58..4dfcc6396b 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 280a46765e..e0ae3d00c0 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 818cd336f1..05ec2f248b 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 8fbd209e0a..bbc8f728d5 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 c4b0e5d567..3f58fdcaac 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 1b2edae593..7a54680286 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 566deff116..089166971f 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 7234cbe139..17e8ef5da9 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 bda4eac6aa..3f82a1bbe8 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 78c62b5e1e..2b0ea25a1b 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 e5160a9d5b..b54296c112 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 1595dc524c..0419a5439b 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 7a4356c453..671e1160f6 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 66e7ec55b4..f3d3b64d6b 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 8ca79f6f39..f58dd33945 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 cae5ca8135..e0c2ae54bc 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 7618150da2..1f363fd4a3 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 81c8cc6da5..bdd7017c8f 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 e9cd347975..67205c06c0 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 e63a3279a2..976d0a7507 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 dd20f28939..55b3d3e41d 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 a7a6197258..6c087d9461 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 6e8f277114..912c1bb926 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 2c5325a98a..e084b0e494 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 b29e9edada..af46dc221a 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 de93c8eb82..b519bb20a1 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 f662b8fd51..bed2da4d0d 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 3789bc3173..2935904366 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 387eda0baf..da1398e51a 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 e01e8fc9d9..a76b2a3288 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 b491a4ccc9..cb9be5cdb8 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 25f0da0c85..f7db3f2162 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 b780a2405a..41adeea0fd 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 bb4c695c23..948bc19de6 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 81999d0501..edf0104da1 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 36201d54b6..887c77d424 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 15f6fa0b8a..95586e4fae 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 25f0da0c85..f7db3f2162 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 2a7fcc04cb..9009c89ab7 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 668d438a46..dfe859478c 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 4f34d83470..8ac22bdf8d 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 f83496fa79..3f8b15c1a6 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 437c733a10..ba298afc8e 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 4266c96360..2401480ad9 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 9d5322bfe3..0c3e3aa334 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 1fc4857f2e..d6ad78cb97 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 ca1c6437bd..8b3d13c921 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 0d375c3bad..dd1b677222 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 f03dd36a8d..53c06ca810 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 27518962f5..6846a02df0 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 ef52f0f744..ed364a490e 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 f68ef6463f..0c35a32f68 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 67682d00f3..6497f0e838 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 37749c85e3..418d9d4013 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 139fc34876..a1c69ba189 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 4cda4e5273..1bc2793af2 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 9c3d05becd..c20994877f 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 bd520b0bc8..5865bde41b 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 1424334a7f..434eb44ac1 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 f3139245d8..c554425f8e 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 409b5d5762..149ef7aa7c 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 ad538134bd..4d52878454 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 7f4a01bbd0..5df1b217d4 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 14c7c40d1f..06eb60f6e6 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 1a3006039b..a6d1516162 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 a3d599039c..bf9a167b14 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 653cd27251..34a77256c6 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 eb747d32cc..1d45c89233 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 8e0a1880ce..2c0a74356f 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 cb75cd14d0..39709d23d2 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 634eeab1f8..e3ea3227e9 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 877392075a..63cae39ca8 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 cc94243d89..47e5698787 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 0b194a0537..6941beae85 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 3197f740a0..77e7bdd525 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 4472efb6d4..8b65940749 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 bcfa18391f..22b963c491 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 c7ed054c8a..af83187e92 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 bf39f8cb0f..ffb8349d35 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 939a33b878..f77903544f 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 6451d0d988..1942729194 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 9b2c031e10..9ef243beba 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 316ab2f304..66ee12463e 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 8e004ad61e..c84193c9f3 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 34d7d986c0..49ef1e07b3 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 617b2d6ee5..27597b67dd 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 048bf0d0e7..ed7d6f4d40 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 54875a2b3e..f4a5c80c32 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 37474094d6..491d9bb250 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 6186018168..147b0c07f4 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 c36b42a8c1..1b34a4f420 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 feb39eb8f4..da9cb11280 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 d8e0870cb1..db4df50adb 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 e4ef40f87a..9daf8c30c9 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 78602754c7..3099d90e00 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 214734c4bc..1e42c2504f 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 7b2dac95c2..328eb0710e 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 c887ad2fac..a07fa86950 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 c305880b07..cd976eed42 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 9e9052e7d5..76974ce0ad 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 9a96983ff2..bd3763572b 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 80ced5a74b..8576c7fbf5 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 f8031f0058..3484d397ed 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 09c593e815..8d2f330443 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 6f686172c9..e3ffde504c 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 c524a78e49..a65e11b57c 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 4a14e9d4f5..5590e416b2 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 90bbc7ee5a..4d43d13d68 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 af69d835a5..b44de80314 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 35ae31452d..d0fa167495 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 a1c486b859..2680ef7012 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 3bcffb664f..56f701b9d7 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 caf5b6b4f5..80d714edc2 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 0000000000..643ec6748f --- /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 0000000000..4983ba10b4 --- /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 7d011e45f0..830791181b 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 f64cedf2f9..7b1d43e641 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 59e36fa07e..78b573016e 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 19862e6868..dd7eaf6352 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 4abc5818b0..b452470efa 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 84d7f6c3cb..4e9568a1c5 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 33bb6f10f1..ce719d1843 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 32a5ef8c79..f4d32fa90a 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 14f047fb7b..2d8f0d6d2a 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 477f2b1c89..86432de113 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 41afaa52aa..13d71c433f 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 b1cfe4b3c8..42f3665c86 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 2f2cdf108b..797cb7d942 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 725899ca85..d9a635fdc2 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 47055551e4..bb82b23b66 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 8de817738f..0e2b63fab7 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 396d9d51c8..41e4587ac4 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 e6772c2a8d..9b499760aa 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 608c05ad47..20887881d9 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 250dc2c86e..1e3f4d59c5 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 7c1b0ed9e3..a23d3274cb 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 0f0d081422..c593e6e809 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 5b108c393e..e62c2b0df1 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 d6c773726b..949364cf29 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 367100be84..70055f9381 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 c72d16ebf8..7355d235c5 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 3a7428fd8f..8e06570740 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 c8f414c559..2076c65e9b 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 21e7d0a0f2..42be98ad4e 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 37435b7736..6e7a6dd7b6 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 adf31fe05a..a4645816d8 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 f447ef1e80..12a7bbe6bc 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 19b57bac8b..d50dcb56bc 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 08faa2ce09..64f5e091e6 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 3be2861025..a8d674f15a 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 60d21e0c8c..b5d3bd6432 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 9c1c63a213..93f672bfb9 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 78ec52bacf..2641c6661b 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 fa833a3ec8..637a252052 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 4128f60900..d2f4759cd9 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 09d32c5c52..99f35b0ab3 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 81bcfd0762..b5393729eb 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 16d80adc83..e741cbab4e 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 4591b1f9fa..9a96f7ca3d 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 4ad9958884..52dfd2259b 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 2e3b0e240c..7538792d1c 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 4875731a08..3996cb0606 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 eea9265126..6b9df4f4fb 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 25f0da0c85..f7db3f2162 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 { |