merging r10246:10247 from developer branch to fix manual frequency setting problem

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

diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
index fdf82667ae572b59772829c7374db8292621723a..dd46bbea4795f711fd3b6936f9b0912b415f614a 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
+++ b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
@@ -130,7 +130,7 @@ gr_clock_recovery_mm_ff::general_work (int noutput_items,
     }
   }
 
-  consume_each (ii);
+//  consume_each (ii);
 
-  return noutput_items;
+  return ii; //noutput_items;
 }