Merge branch 'patches/marcus/gr_and_const'

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_agc_cc.cc

diff --git a/gnuradio-core/src/lib/general/gr_agc_cc.cc b/gnuradio-core/src/lib/general/gr_agc_cc.cc
index 7249ee15259d6daaf25a79deec4b015e05de71f0..3f48b55fee836eb4d002d3c74e76778a53d4303d 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_agc_cc.cc
+++ b/gnuradio-core/src/lib/general/gr_agc_cc.cc
@@ -6,7 +6,7 @@
  * 
  * 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
@@ -29,23 +29,25 @@
 #include <gri_agc_cc.h>
 
 gr_agc_cc_sptr
-gr_make_agc_cc (float rate, float reference, float gain, float max_gain)
+gr_make_agc_cc (float rate, float reference, 
+               float gain, float max_gain)
 {
   return gr_agc_cc_sptr (new gr_agc_cc (rate, reference, gain, max_gain));
 }
 
-gr_agc_cc::gr_agc_cc (float rate, float reference, float gain, float max_gain)
+gr_agc_cc::gr_agc_cc (float rate, float reference, 
+                     float gain, float max_gain)
   : gr_sync_block ("gr_agc_cc",
                   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-                  gr_make_io_signature (1, 1, sizeof (gr_complex)))
-  , gri_agc_cc (rate,  reference, gain, max_gain)
+                  gr_make_io_signature (1, 1, sizeof (gr_complex))), 
+    gri_agc_cc (rate, reference, gain, max_gain)
 {
 }
 
 int
 gr_agc_cc::work (int noutput_items,
-                        gr_vector_const_void_star &input_items,
-                        gr_vector_void_star &output_items)
+                gr_vector_const_void_star &input_items,
+                gr_vector_void_star &output_items)
 {
   const gr_complex *in = (const gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];