4 files changed, 4 insertions, 29 deletions
diff --git a/gr-digital/lib/digital_constellation_receiver_cb.h b/gr-digital/lib/digital_constellation_receiver_cb.h
index 3885b301e..0ac80450f 100644
--- a/gr-digital/lib/digital_constellation_receiver_cb.h
+++ b/gr-digital/lib/digital_constellation_receiver_cb.h
@@ -66,7 +66,7 @@ digital_make_constellation_receiver_cb (digital_constellation_sptr constellation
 
 class digital_constellation_receiver_cb : public gr_block, public gri_control_loop
 {
- public:
+public:
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
 		    gr_vector_const_void_star &input_items,
@@ -91,7 +91,7 @@ protected:
 
   void phase_error_tracking(float phase_error);
 
-  private:
+private:
   unsigned int d_M;
 
   digital_constellation_sptr d_constellation;
@@ -106,15 +106,6 @@ protected:
   //! index to delay line
   unsigned int d_dl_idx;
 
-  /*! \brief update the system gains from the loop bandwidth and damping factor
-   *
-   *  This function updates the system gains based on the loop
-   *  bandwidth and damping factor of the system.
-   *  These two factors can be set separately through their own
-   *  set functions.
-   */
-  void update_gains();
-
   friend digital_constellation_receiver_cb_sptr
   digital_make_constellation_receiver_cb (digital_constellation_sptr constell,
 					  float loop_bw, float fmin, float fmax);
diff --git a/gr-digital/lib/digital_fll_band_edge_cc.h b/gr-digital/lib/digital_fll_band_edge_cc.h
index 5b7732906..4fa7b3a3e 100644
--- a/gr-digital/lib/digital_fll_band_edge_cc.h
+++ b/gr-digital/lib/digital_fll_band_edge_cc.h
@@ -102,8 +102,6 @@ class digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
   float                   d_sps;
   float                   d_rolloff;
   int                     d_filter_size;
-  float                   d_max_freq;
-  float                   d_min_freq;
 
   std::vector<gr_complex> d_taps_lower;
   std::vector<gr_complex> d_taps_upper;
diff --git a/gr-digital/lib/digital_mpsk_receiver_cc.h b/gr-digital/lib/digital_mpsk_receiver_cc.h
index 91cd4a14d..f8aa4e341 100644
--- a/gr-digital/lib/digital_mpsk_receiver_cc.h
+++ b/gr-digital/lib/digital_mpsk_receiver_cc.h
@@ -239,7 +239,7 @@ protected:
    */
   unsigned int decision_qpsk(gr_complex sample) const;
 
-  private:
+private:
   unsigned int d_M;
   float        d_theta;
 
diff --git a/gr-digital/swig/digital_constellation_receiver_cb.i b/gr-digital/swig/digital_constellation_receiver_cb.i
index e4be5f39f..9c4ba645e 100644
--- a/gr-digital/swig/digital_constellation_receiver_cb.i
+++ b/gr-digital/swig/digital_constellation_receiver_cb.i
@@ -28,23 +28,9 @@ digital_constellation_receiver_cb_sptr
 digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
 					float loop_bw, float fmin, float fmax);
 
-class digital_constellation_receiver_cb : public gr_block
+class digital_constellation_receiver_cb : public gr_block, public gri_control_loop
 {
  private:
   digital_constellation_receiver_cb (digital_contellation_sptr constellation,
 				     float loop_bw, float fmin, float fmax);
-public:
-  void set_loop_bandwidth(float bw);
-  void set_damping_factor(float df);
-  void set_alpha(float alpha);
-  void set_beta(float beta);
-  void set_frequency(float freq);
-  void set_phase(float phase);
-
-  float get_loop_bandwidth() const;
-  float get_damping_factor() const;
-  float get_alpha() const;
-  float get_beta() const;
-  float get_frequency() const;
-  float get_phase() const;
 };