From 765d82d839e1773c77556e5d73ab229cbe6b96dc Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 17 Jun 2012 16:48:35 -0400
Subject: filter: redoing hilbert and fir_delay to use normal filter calls
 since alignment is properly handled.

---
 gr-filter/lib/filter_delay_fc_impl.cc | 7 ++-----
 gr-filter/lib/hilbert_fc_impl.cc      | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'gr-filter')

diff --git a/gr-filter/lib/filter_delay_fc_impl.cc b/gr-filter/lib/filter_delay_fc_impl.cc
index 279368664..3bb550864 100644
--- a/gr-filter/lib/filter_delay_fc_impl.cc
+++ b/gr-filter/lib/filter_delay_fc_impl.cc
@@ -78,7 +78,6 @@ namespace gr {
       float *in0 = (float *)input_items[0];
       float *in1 = (float *)input_items[1];
       gr_complex *out = (gr_complex *)output_items[0];
-      float d_out;
 
       if(d_update) {
 	d_fir->set_taps(d_taps);
@@ -90,17 +89,15 @@ namespace gr {
       switch(input_items.size ()) {
       case 1:
 	for(int i = 0; i < noutput_items; i++) {
-	  d_fir->filterN(&d_out, &in0[i], 1);
 	  out[i] = gr_complex(in0[i + d_delay],
-			      d_out);
+			      d_fir->filter(&in0[i]));
 	}
 	break;
 	
       case 2:
 	for(int j = 0; j < noutput_items; j++) {
-	  d_fir->filterN(&d_out, &in1[j], 1);
 	  out[j] = gr_complex(in0[j + d_delay],
-			      d_out);
+			      d_fir->filter(&in1[j]));
 	}
 	break;
 	
diff --git a/gr-filter/lib/hilbert_fc_impl.cc b/gr-filter/lib/hilbert_fc_impl.cc
index 7aaa23a62..52b2dabae 100644
--- a/gr-filter/lib/hilbert_fc_impl.cc
+++ b/gr-filter/lib/hilbert_fc_impl.cc
@@ -63,12 +63,10 @@ namespace gr {
     {
       float *in = (float *)input_items[0];
       gr_complex *out = (gr_complex *)output_items[0];
-      float h_out;
       
       for(int i = 0; i < noutput_items; i++) {
-	d_hilb->filterN(&h_out, &in[i], 1);
 	out[i] = gr_complex(in[i + d_ntaps/2],
-			    h_out);
+			    d_hilb->filter(&in[i]));
       }
       
       return noutput_items;
-- 
cgit