diff options
Diffstat (limited to 'gr-blocks/lib')
-rw-r--r-- | gr-blocks/lib/message_strobe_impl.cc | 4 | ||||
-rw-r--r-- | gr-blocks/lib/message_strobe_impl.h | 8 | ||||
-rw-r--r-- | gr-blocks/lib/message_strobe_random_impl.cc | 10 | ||||
-rw-r--r-- | gr-blocks/lib/message_strobe_random_impl.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index 96b079a0ed..5304faf165 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -39,13 +39,13 @@ namespace gr { namespace blocks { message_strobe::sptr - message_strobe::make(pmt::pmt_t msg, float period_ms) + message_strobe::make(pmt::pmt_t msg, long period_ms) { return gnuradio::get_initial_sptr (new message_strobe_impl(msg, period_ms)); } - message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, float period_ms) + message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms) : block("message_strobe", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)), diff --git a/gr-blocks/lib/message_strobe_impl.h b/gr-blocks/lib/message_strobe_impl.h index 3ce71af58f..06a3fd3374 100644 --- a/gr-blocks/lib/message_strobe_impl.h +++ b/gr-blocks/lib/message_strobe_impl.h @@ -33,19 +33,19 @@ namespace gr { private: boost::shared_ptr<gr::thread::thread> d_thread; bool d_finished; - float d_period_ms; + long d_period_ms; pmt::pmt_t d_msg; void run(); public: - message_strobe_impl(pmt::pmt_t msg, float period_ms); + message_strobe_impl(pmt::pmt_t msg, long period_ms); ~message_strobe_impl(); void set_msg(pmt::pmt_t msg) { d_msg = msg; } pmt::pmt_t msg() const { return d_msg; } - void set_period(float period_ms) { d_period_ms = period_ms; } - float period() const { return d_period_ms; } + void set_period(long period_ms) { d_period_ms = period_ms; } + long period() const { return d_period_ms; } // Overloading these to start and stop the internal thread that // periodically produces the message. diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc index c62aad1c7a..a5c6693215 100644 --- a/gr-blocks/lib/message_strobe_random_impl.cc +++ b/gr-blocks/lib/message_strobe_random_impl.cc @@ -69,15 +69,15 @@ namespace gr { boost::bind(&message_strobe_random_impl::set_msg, this, _1)); } - float message_strobe_random_impl::next_delay(){ + long message_strobe_random_impl::next_delay(){ switch(d_dist){ case STROBE_POISSON: //return d_variate_poisson->operator()(); - return d_variate_poisson->operator()(); + return static_cast<long>(d_variate_poisson->operator()()); case STROBE_GAUSSIAN: - return d_variate_normal->operator()(); + return static_cast<long>(d_variate_normal->operator()()); case STROBE_UNIFORM: - return d_variate_uniform->operator()(); + return static_cast<long>(d_variate_uniform->operator()()); default: throw std::runtime_error("message_strobe_random_impl::d_distribution is very unhappy with you"); } @@ -108,7 +108,7 @@ namespace gr { void message_strobe_random_impl::run() { while(!d_finished) { - boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay()))); + boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0L, next_delay()))); if(d_finished) { return; } diff --git a/gr-blocks/lib/message_strobe_random_impl.h b/gr-blocks/lib/message_strobe_random_impl.h index 2dcaa7effa..786f3288f6 100644 --- a/gr-blocks/lib/message_strobe_random_impl.h +++ b/gr-blocks/lib/message_strobe_random_impl.h @@ -43,7 +43,7 @@ namespace gr { message_strobe_random_distribution_t d_dist; pmt::pmt_t d_msg; void run(); - float next_delay(); + long next_delay(); boost::mt19937 d_rng; boost::shared_ptr< boost::variate_generator <boost::mt19937, boost::poisson_distribution<> > > d_variate_poisson; |