Merge branch 'alsa_drop_samples'

[debian/gnuradio] / gnuradio-core / src / lib / filter / gr_iir_filter_ffd.cc

diff --git a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.cc b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.cc
index 4e825e7a89e210381ed473ea78ad8bc99aa287ae..a41a4f7dbace46e760d72d3c68b58f08184902c9 100644 (file)
--- a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.cc
+++ b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.cc
@@ -1,12 +1,12 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -33,7 +33,7 @@ gr_iir_filter_ffd_sptr
 gr_make_iir_filter_ffd (const std::vector<double> &fftaps,
                        const std::vector<double> &fbtaps) throw (std::invalid_argument)
 {
-  return gr_iir_filter_ffd_sptr (new gr_iir_filter_ffd (fftaps, fbtaps));
+  return gnuradio::get_initial_sptr(new gr_iir_filter_ffd (fftaps, fbtaps));
 }
 
 gr_iir_filter_ffd::gr_iir_filter_ffd (const std::vector<double> &fftaps,
@@ -57,11 +57,6 @@ void
 gr_iir_filter_ffd::set_taps (const std::vector<double> &fftaps,
                             const std::vector<double> &fbtaps) throw (std::invalid_argument)
 {
-  if (fftaps.size () != fbtaps.size ()){
-    fprintf (stderr,
-     "gr_iir_filter_ffd::set_taps: fftaps and fbtaps must have the same number of elements.\n");
-    throw std::invalid_argument ("gr_iir_filter_ffd::set_taps");
-  }
   
   d_new_fftaps = fftaps;
   d_new_fbtaps = fbtaps;
@@ -76,7 +71,6 @@ gr_iir_filter_ffd::work (int noutput_items,
   const float *in = (const float *) input_items[0];
   float *out = (float *) output_items[0];
 
-  // fprintf (stderr, "gr_iir_filter_ffd::work noutput_items = %d\n", noutput_items);
 
   if (d_updated){
     d_iir.set_taps (d_new_fftaps, d_new_fbtaps);