From: Tom Rondeau <trondeau@vt.edu>
Date: Thu, 7 Oct 2010 00:50:25 +0000 (-0400)
Subject: Fixed missing set_relative_rate in these two blocks. The others don't actually do... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3ac56587df80ee257b36a7c088d0ede8d1c7a18c;p=debian%2Fgnuradio

Fixed missing set_relative_rate in these two blocks. The others don't actually do it, even though it's counter-intuitive for the pfb_decimate, which is a sync_block (decimation actually care of in the stream_to_streams).
---

diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
index 2c5e3a7a..39963200 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
@@ -35,7 +35,7 @@ gr_pfb_arb_resampler_ccf_sptr gr_make_pfb_arb_resampler_ccf (float rate,
 							     unsigned int filter_size)
 {
   return gnuradio::get_initial_sptr(new gr_pfb_arb_resampler_ccf (rate, taps,
-								      filter_size));
+								  filter_size));
 }
 
 
@@ -81,6 +81,8 @@ gr_pfb_arb_resampler_ccf::gr_pfb_arb_resampler_ccf (float rate,
   create_diff_taps(taps, dtaps);
   create_taps(taps, d_taps, d_filters);
   create_taps(dtaps, d_dtaps, d_diff_filters);
+
+  set_relative_rate(rate);
 }
 
 gr_pfb_arb_resampler_ccf::~gr_pfb_arb_resampler_ccf ()
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc
index f86782da..cb67b810 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc
@@ -60,6 +60,8 @@ gr_pfb_channelizer_ccf::gr_pfb_channelizer_ccf (unsigned int numchans,
   if(fltp != 0.0)
     throw std::invalid_argument("gr_pfb_channelizer: oversample rate must be N/i for i in [1, N]"); 
 
+  set_relative_rate(1.0/intp);
+
   d_filters = std::vector<gr_fir_ccf*>(d_numchans);
 
   // Create an FIR filter for each channel and zero out the taps