filter: some cleanup with the dc_blocker code.

6 files changed, 17 insertions, 15 deletions

diff --git a/gr-filter/include/filter/dc_blocker_cc.h b/gr-filter/include/filter/dc_blocker_cc.h
index 64d7ebffc..b0a38ffcb 100644
--- a/gr-filter/include/filter/dc_blocker_cc.h
+++ b/gr-filter/include/filter/dc_blocker_cc.h
@@ -25,7 +25,6 @@
 
 #include <filter/api.h>
 #include <gr_sync_block.h>
-#include <deque>
 
 namespace gr {
   namespace filter {
@@ -38,7 +37,7 @@ namespace gr {
       typedef boost::shared_ptr<dc_blocker_cc> sptr;
 
       /*!
-       * \class gr_dc_blocker_cc
+       * \class dc_blocker_cc
        * \brief a computationally efficient controllable DC blocker
        *
        * \ingroup filter_blk
@@ -67,6 +66,8 @@ namespace gr {
        * \param long_form  (bool) whether to use long (true, default) or short form
        */
       static FILTER_API sptr make(int D, bool long_form);
+
+      virtual int group_delay() = 0;
     };
 
   } /* namespace filter */
diff --git a/gr-filter/include/filter/dc_blocker_ff.h b/gr-filter/include/filter/dc_blocker_ff.h
index d1c7e7819..18c729768 100644
--- a/gr-filter/include/filter/dc_blocker_ff.h
+++ b/gr-filter/include/filter/dc_blocker_ff.h
@@ -25,7 +25,6 @@
 
 #include <filter/api.h>
 #include <gr_sync_block.h>
-#include <deque>
 
 namespace gr {
   namespace filter {
@@ -38,7 +37,7 @@ namespace gr {
       typedef boost::shared_ptr<dc_blocker_ff> sptr;
 
       /*!
-       * \class gr_dc_blocker_ff
+       * \class dc_blocker_ff
        * \brief a computationally efficient controllable DC blocker
        *
        * \ingroup filter_blk
@@ -67,6 +66,8 @@ namespace gr {
        * \param long_form  (bool) whether to use long (true, default) or short form
        */
       static FILTER_API sptr make(int D, bool long_form=true);
+
+      virtual int group_delay() = 0;
     };
 
   } /* namespace filter */
diff --git a/gr-filter/lib/dc_blocker_cc_impl.cc b/gr-filter/lib/dc_blocker_cc_impl.cc
index 11974e5ae..663ba94f1 100644
--- a/gr-filter/lib/dc_blocker_cc_impl.cc
+++ b/gr-filter/lib/dc_blocker_cc_impl.cc
@@ -64,9 +64,9 @@ namespace gr {
 
 
     dc_blocker_cc_impl::dc_blocker_cc_impl(int D, bool long_form)
-      : gr_sync_block ("dc_blocker_cc",
-		       gr_make_io_signature (1, 1, sizeof(gr_complex)),
-		       gr_make_io_signature (1, 1, sizeof(gr_complex))),
+      : gr_sync_block("dc_blocker_cc",
+		      gr_make_io_signature (1, 1, sizeof(gr_complex)),
+		      gr_make_io_signature (1, 1, sizeof(gr_complex))),
 	d_length(D), d_long_form(long_form)
     {
       if(d_long_form) {
@@ -97,7 +97,7 @@ namespace gr {
     }
 
     int
-    dc_blocker_cc_impl::get_group_delay()
+    dc_blocker_cc_impl::group_delay()
     {
       if(d_long_form)
 	return (2*d_length-2);
diff --git a/gr-filter/lib/dc_blocker_cc_impl.h b/gr-filter/lib/dc_blocker_cc_impl.h
index 7c8d1d93d..6f8bc16c7 100644
--- a/gr-filter/lib/dc_blocker_cc_impl.h
+++ b/gr-filter/lib/dc_blocker_cc_impl.h
@@ -61,7 +61,7 @@ namespace gr {
 
       ~dc_blocker_cc_impl();
 
-      int get_group_delay();
+      int group_delay();
       
       //int set_length(int D);
       
diff --git a/gr-filter/lib/dc_blocker_ff_impl.cc b/gr-filter/lib/dc_blocker_ff_impl.cc
index 86d2f2f7a..22822d147 100644
--- a/gr-filter/lib/dc_blocker_ff_impl.cc
+++ b/gr-filter/lib/dc_blocker_ff_impl.cc
@@ -61,10 +61,10 @@ namespace gr {
       return gnuradio::get_initial_sptr(new dc_blocker_ff_impl(D, long_form));
     }
 
-    dc_blocker_ff_impl::dc_blocker_ff_impl (int D, bool long_form)
-      : gr_sync_block ("dc_blocker_ff",
-		       gr_make_io_signature (1, 1, sizeof(float)),
-		       gr_make_io_signature (1, 1, sizeof(float))),
+    dc_blocker_ff_impl::dc_blocker_ff_impl(int D, bool long_form)
+      : gr_sync_block("dc_blocker_ff",
+		      gr_make_io_signature (1, 1, sizeof(float)),
+		      gr_make_io_signature (1, 1, sizeof(float))),
 	d_length(D), d_long_form(long_form)
     {
       if(d_long_form) {
@@ -95,7 +95,7 @@ namespace gr {
     }
 
     int
-    dc_blocker_ff_impl::get_group_delay()
+    dc_blocker_ff_impl::group_delay()
     {
       if(d_long_form)
 	return (2*d_length-2);
diff --git a/gr-filter/lib/dc_blocker_ff_impl.h b/gr-filter/lib/dc_blocker_ff_impl.h
index 868e1d433..5ae60e2e4 100644
--- a/gr-filter/lib/dc_blocker_ff_impl.h
+++ b/gr-filter/lib/dc_blocker_ff_impl.h
@@ -61,7 +61,7 @@ namespace gr {
 
       ~dc_blocker_ff_impl();
 
-      int get_group_delay();
+      int group_delay();
       
       //int set_length(int D);