Merge branch 'qtupdate'

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_agc_ff.h

diff --git a/gnuradio-core/src/lib/general/gr_agc_ff.h b/gnuradio-core/src/lib/general/gr_agc_ff.h
index da7edb7aa2196d351575c257e430b26271e11603..7cb167fca2530d63d6044f1491aa7ded39e12c3e 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_agc_ff.h
+++ b/gnuradio-core/src/lib/general/gr_agc_ff.h
@@ -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,29 +16,33 @@
  * 
  * 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.
  */
 
 #ifndef INCLUDED_GR_AGC_FF_H
 #define INCLUDED_GR_AGC_FF_H
 
 #include <gr_sync_block.h>
-#include <gri_agc.h>
+#include <gri_agc_ff.h>
 class gr_agc_ff;
 typedef boost::shared_ptr<gr_agc_ff> gr_agc_ff_sptr;
 
 gr_agc_ff_sptr
-gr_make_agc_ff (float rate = 1e-4, float reference = 1.0, float gain = 1.0, float max_gain = 0.0);
+gr_make_agc_ff (float rate = 1e-4, float reference = 1.0, 
+               float gain = 1.0, float max_gain = 0.0);
+
 /*!
  * \brief high performance Automatic Gain Control class
+ * \ingroup level_blk
  *
  * Power is approximated by absolute value
  */
 
-class gr_agc_ff : public gr_sync_block, public gri_agc
+class gr_agc_ff : public gr_sync_block, public gri_agc_ff
 {
-  friend gr_agc_ff_sptr gr_make_agc_ff (float rate, float reference, float gain, float max_gain);
+  friend gr_agc_ff_sptr gr_make_agc_ff (float rate, float reference, 
+                                       float gain, float max_gain);
   gr_agc_ff (float rate, float reference, float gain, float max_gain);
 
  public: