Merged changes from svn repository trunk.

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

diff --git a/gnuradio-core/src/lib/general/gr_regenerate_bb.cc b/gnuradio-core/src/lib/general/gr_regenerate_bb.cc
index 6b0535e189800ff9400fb6112bc1a5a04baa4ea4..1836755204e2495347ff5ef0b536e9b9ff3dd643 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_regenerate_bb.cc
+++ b/gnuradio-core/src/lib/general/gr_regenerate_bb.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,
@@ -38,11 +38,26 @@ gr_regenerate_bb::gr_regenerate_bb (int period, unsigned int max_regen)
                   gr_make_io_signature (1, 1, sizeof (char)),
                   gr_make_io_signature (1, 1, sizeof (char))),
     d_period(period),
+    d_countdown(0),
     d_max_regen(max_regen),
-    d_regen_count(0)
+    d_regen_count(max_regen)
 {
 }
 
+void gr_regenerate_bb::set_max_regen(unsigned int regen)
+{
+  d_max_regen = regen;
+  d_countdown = 0;
+  d_regen_count = d_max_regen;
+}
+
+void gr_regenerate_bb::set_period(int period)
+{
+  d_period = period;
+  d_countdown = 0;
+  d_regen_count = d_max_regen;
+}
+
 int
 gr_regenerate_bb::work (int noutput_items,
                        gr_vector_const_void_star &input_items,
@@ -53,14 +68,8 @@ gr_regenerate_bb::work (int noutput_items,
 
   for (int i = 0; i < noutput_items; i++){
     optr[i] = 0;
-    
-    if(iptr[i] == 1) {
-      d_countdown = d_period;
-      optr[i] = 1;
-      d_regen_count = 0;
-    }
 
-    if(d_regen_count <= d_max_regen) {
+    if(d_regen_count < d_max_regen) {
       d_countdown--;
       
       if(d_countdown == 0) {
@@ -69,6 +78,13 @@ gr_regenerate_bb::work (int noutput_items,
        d_regen_count++;
       }
     }
+    
+    if(iptr[i] == 1) {
+      d_countdown = d_period;
+      optr[i] = 1;
+      d_regen_count = 0;
+    }
+
   }
   return noutput_items;
 }