[Commit-gnuradio] r11464 - gnuradio/trunk/gnuradio-core/src/lib/general

[n4hy]

Author: n4hy
Date: 2009-07-20 12:47:24 -0600 (Mon, 20 Jul 2009)
New Revision: 11464

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.h
Log:
last changes here to gr_fmdet until pfb trondeau pfb branch is folded in

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.cc 2009-07-20 
16:57:57 UTC (rev 11463)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.cc 2009-07-20 
18:47:24 UTC (rev 11464)
@@ -62,6 +62,7 @@
   d_scl = scl;
   d_bias = 0.5*scl*(d_freqhi+d_freqlo)/delta;
   for (int i=0;i<15;i++) taps[i] = h[i];
+  //  d_filter = gr_fir_util::create_gr_fir_ccf(taps);
   
 }
 
@@ -72,7 +73,7 @@
 {
   const gr_complex *iptr = (gr_complex *) input_items[0];
   float *optr = (float *) output_items[0];
-  const gr_complex *scaleiptr = (gr_complex *) input_items[0];
+  //  const gr_complex *scaleiptr = (gr_complex *) input_items[0];
 
   int  size = noutput_items;
 

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.h  2009-07-20 
16:57:57 UTC (rev 11463)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_fmdet_cf.h  2009-07-20 
18:47:24 UTC (rev 11464)
@@ -30,6 +30,9 @@
 
 gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate, float freq_low, float 
freq_high, float scl);
 
+class gr_fir_ccf;
+
+
 /*!
  * \brief Implements an IQ slope detector
  * 
@@ -47,6 +50,7 @@
 
   gr_complex d_S1,d_S2,d_S3,d_S4;
   float d_freq,d_freqlo,d_freqhi,d_scl,d_bias;
+  gr_fir_ccf* d_filter;
   gr_fmdet_cf (float samplerate, float freq_low, float freq_high, float scl);
 
   int work (int noutput_items,