last changes here to gr_fmdet until pfb trondeau pfb branch is folded in

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11464 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/lib/general/gr_fmdet_cf.cc b/gnuradio-core/src/lib/general/gr_fmdet_cf.cc
index 9a8a6a48af3734dc2038cc8a38933a59d907ad05..e2c7e7a7f9cb5588c28e6ceb0c7a0c8070972704 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_fmdet_cf.cc
+++ b/gnuradio-core/src/lib/general/gr_fmdet_cf.cc
@@ -62,6 +62,7 @@ gr_fmdet_cf::gr_fmdet_cf (float samplerate, float freq_low, float freq_high, flo
   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 @@ gr_fmdet_cf::work (int noutput_items,
 {
   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;
 

diff --git a/gnuradio-core/src/lib/general/gr_fmdet_cf.h b/gnuradio-core/src/lib/general/gr_fmdet_cf.h
index 7e8be31b1d27c6cc30187493b56a1cc15ccdb337..792646bef225b6b605a7f3ac499d5fac0df866c1 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_fmdet_cf.h
+++ b/gnuradio-core/src/lib/general/gr_fmdet_cf.h
@@ -30,6 +30,9 @@ typedef boost::shared_ptr<gr_fmdet_cf> gr_fmdet_cf_sptr;
 
 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 @@ class gr_fmdet_cf : public gr_sync_block
 
   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,