Fixing doxygen warnings from arb_resampler. Also, removed set_taps from public

interface since we don't _really_ suppor this right now. Renamed it and made it private.

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 48eb849ab1f32ca54bdd47c003ce8674edbc8e28..5a6e753ab4c2b45d61ee4e432fae921d0b9668d4 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Free Software Foundation, Inc.
+ * Copyright 2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -79,8 +79,8 @@ gr_pfb_arb_resampler_ccf::gr_pfb_arb_resampler_ccf (float rate,
   // Now, actually set the filters' taps
   std::vector<float> dtaps;
   create_diff_taps(taps, dtaps);
-  set_taps(taps, d_taps, d_filters);
-  set_taps(dtaps, d_dtaps, d_diff_filters);
+  create_taps(taps, d_taps, d_filters);
+  create_taps(dtaps, d_dtaps, d_diff_filters);
 }
 
 gr_pfb_arb_resampler_ccf::~gr_pfb_arb_resampler_ccf ()
@@ -91,9 +91,9 @@ gr_pfb_arb_resampler_ccf::~gr_pfb_arb_resampler_ccf ()
 }
 
 void
-gr_pfb_arb_resampler_ccf::set_taps (const std::vector<float> &newtaps,
-                                   std::vector< std::vector<float> > &ourtaps,
-                                   std::vector<gr_fir_ccf*> &ourfilter)
+gr_pfb_arb_resampler_ccf::create_taps (const std::vector<float> &newtaps,
+                                      std::vector< std::vector<float> > &ourtaps,
+                                      std::vector<gr_fir_ccf*> &ourfilter)
 {
   int i,j;
 

diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h
index b99ad286b888588991af8109cc1dbd17dc5ca192..cf5a79d4eec760bea8775bb28c7e0dc181685383 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Free Software Foundation, Inc.
+ * Copyright 2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -139,18 +139,23 @@ class gr_pfb_arb_resampler_ccf : public gr_block
 
   void create_diff_taps(const std::vector<float> &newtaps,
                        std::vector<float> &difftaps);
-  
-public:
-  ~gr_pfb_arb_resampler_ccf ();
- 
+
   /*!
    * Resets the filterbank's filter taps with the new prototype filter
-   * \param taps    (vector/list of floats) The prototype filter to populate the filterbank. The taps
-   *                                        should be generated at the interpolated sampling rate.
+   * \param newtaps    (vector of floats) The prototype filter to populate the filterbank. 
+   *                   The taps should be generated at the interpolated sampling rate.
+   * \param ourtaps    (vector of floats) Reference to our internal member of holding the taps.
+   * \param ourfilter  (vector of filters) Reference to our internal filter to set the taps for.
    */
-  void set_taps (const std::vector<float> &newtaps,
-                std::vector< std::vector<float> > &ourtaps,
-                std::vector<gr_fir_ccf*> &ourfilter);
+  void create_taps (const std::vector<float> &newtaps,
+                   std::vector< std::vector<float> > &ourtaps,
+                   std::vector<gr_fir_ccf*> &ourfilter);
+
+  
+public:
+  ~gr_pfb_arb_resampler_ccf ();
+
+  // FIXME: See about a set_taps function during runtime.
 
   /*!
    * Print all of the filterbank taps to screen.