[Commit-gnuradio] r11344 - gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter

[trondeau]

Author: trondeau
Date: 2009-07-05 09:31:19 -0600 (Sun, 05 Jul 2009)
New Revision: 11344

Modified:
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.cc
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.i
Log:
This should be a gr_sync_block and not a decimator since we are taking in D 
streams of data, so the number of outputs is equalt to the number of inputs on 
any one stream. Forehead-slap mistake.

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.cc
      2009-07-05 15:25:59 UTC (rev 11343)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.cc
      2009-07-05 15:31:19 UTC (rev 11344)
@@ -42,10 +42,9 @@
 gr_pfb_decimator_ccf::gr_pfb_decimator_ccf (unsigned int decim, 
                                            const std::vector<float> &taps,
                                            unsigned int channel)
-  : gr_sync_decimator ("pfb_decimator_ccf",
-                      gr_make_io_signature (decim, decim, sizeof(gr_complex)),
-                      gr_make_io_signature (1, 1, sizeof(gr_complex)),
-                      decim),
+  : gr_sync_block ("pfb_decimator_ccf",
+                  gr_make_io_signature (decim, decim, sizeof(gr_complex)),
+                  gr_make_io_signature (1, 1, sizeof(gr_complex))),
     d_updated (false)
 {
   d_rate = decim;
@@ -102,22 +101,22 @@
 
   d_updated = true;
 }
-//#define ROTATEFFT
+
+#define ROTATEFFT
 int
 gr_pfb_decimator_ccf::work (int noutput_items,
                            gr_vector_const_void_star &input_items,
                            gr_vector_void_star &output_items)
 {
-  gr_complex *in = (gr_complex *) input_items[0];
+  gr_complex *in;
   gr_complex *out = (gr_complex *) output_items[0];
 
   if (d_updated) {
     d_updated = false;
-    consume_each(0);
     return 0;               // history requirements may have changed.
   }
 
-  int i = 0;
+  int i;
   for(i = 0; i < noutput_items; i++) {
     // Move through filters from bottom to top
     out[i] = 0;

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
       2009-07-05 15:25:59 UTC (rev 11343)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
       2009-07-05 15:31:19 UTC (rev 11344)
@@ -24,7 +24,7 @@
 #ifndef INCLUDED_GR_PFB_DECIMATOR_CCF_H
 #define        INCLUDED_GR_PFB_DECIMATOR_CCF_H
 
-#include <gr_sync_decimator.h>
+#include <gr_sync_block.h>
 
 class gr_pfb_decimator_ccf;
 typedef boost::shared_ptr<gr_pfb_decimator_ccf> gr_pfb_decimator_ccf_sptr;
@@ -39,7 +39,7 @@
  * \brief FIR filter with gr_complex input, gr_complex output and float taps
  * \ingroup filter_blk
  */
-class gr_pfb_decimator_ccf : public gr_sync_decimator
+class gr_pfb_decimator_ccf : public gr_sync_block
 {
  private:
   friend gr_pfb_decimator_ccf_sptr gr_make_pfb_decimator_ccf (unsigned int 
decim,

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.i
       2009-07-05 15:25:59 UTC (rev 11343)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.i
       2009-07-05 15:31:19 UTC (rev 11344)
@@ -26,7 +26,7 @@
                                                     const std::vector<float> 
&taps,
                                                     unsigned int channel);
 
-class gr_pfb_decimator_ccf : public gr_sync_decimator
+class gr_pfb_decimator_ccf : public gr_sync_block
 {
  private:
   gr_pfb_decimator_ccf (unsigned int decim,