[Commit-gnuradio] [gnuradio] 28/28: just a bunch of tweaks

[git]

This is an automated email from the git hooks/post-receive script.

nwest pushed a commit to annotated tag gr_basic_work
in repository gnuradio.

commit 8ffc80aa8471d21850c23852115e020a97842bb1
Author: Josh Blum <address@hidden>
Date:   Tue Nov 15 22:37:45 2011 -0800

    just a bunch of tweaks
---
 gr-basic/include/gr_basic_sig_source.h  |  5 +++++
 gr-basic/lib/gr_basic_add.cc            |  2 +-
 gr-basic/lib/gr_basic_add_const.cc      |  2 +-
 gr-basic/lib/gr_basic_delay.cc          |  3 +--
 gr-basic/lib/gr_basic_divide.cc         |  2 +-
 gr-basic/lib/gr_basic_multiply.cc       |  2 +-
 gr-basic/lib/gr_basic_multiply_const.cc |  2 +-
 gr-basic/lib/gr_basic_subtract.cc       |  2 +-
 gr-filter/lib/gr_filter_decim_fir.cc    | 10 ----------
 9 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/gr-basic/include/gr_basic_sig_source.h 
b/gr-basic/include/gr_basic_sig_source.h
index a520aa8..7d51a0f 100644
--- a/gr-basic/include/gr_basic_sig_source.h
+++ b/gr-basic/include/gr_basic_sig_source.h
@@ -45,6 +45,11 @@ public:
     //! Set the frequency, this is a fractional number between -1 and 1
     virtual void set_frequency(const double) = 0;
 
+    //! Convenience call to set frequency with sample rate
+    void set_frequency(const double samp_rate, const double wave_freq){
+        return this->set_frequency(wave_freq/samp_rate);
+    }
+
 };
 
 #endif /* INCLUDED_GR_BASIC_SIG_SOURCE_H */
diff --git a/gr-basic/lib/gr_basic_add.cc b/gr-basic/lib/gr_basic_add.cc
index 63cdb88..3a04e2c 100644
--- a/gr-basic/lib/gr_basic_add.cc
+++ b/gr-basic/lib/gr_basic_add.cc
@@ -110,7 +110,7 @@ private:
 };
 
 /***********************************************************************
- * Adder factory function
+ * factory function
  **********************************************************************/
 gr_basic_add::sptr gr_basic_add::make(op_type type, const size_t vlen){
     switch(type){
diff --git a/gr-basic/lib/gr_basic_add_const.cc 
b/gr-basic/lib/gr_basic_add_const.cc
index 959282b..30c002f 100644
--- a/gr-basic/lib/gr_basic_add_const.cc
+++ b/gr-basic/lib/gr_basic_add_const.cc
@@ -93,7 +93,7 @@ private:
 };
 
 /***********************************************************************
- * Adder factory function
+ * factory function
  **********************************************************************/
 gr_basic_add_const::sptr gr_basic_add_const::make(op_type type, const size_t 
vlen){
     switch(type){
diff --git a/gr-basic/lib/gr_basic_delay.cc b/gr-basic/lib/gr_basic_delay.cc
index 52c3576..de6d4d5 100644
--- a/gr-basic/lib/gr_basic_delay.cc
+++ b/gr-basic/lib/gr_basic_delay.cc
@@ -56,8 +56,7 @@ public:
 
         //consume but not produce (drops samples)
         if (delta < 0){
-            const int num_consume = std::min(ninput_items[0], -delta);
-            consume_each(num_consume);
+            consume_each(std::min(ninput_items[0], -delta));
             return 0;
         }
 
diff --git a/gr-basic/lib/gr_basic_divide.cc b/gr-basic/lib/gr_basic_divide.cc
index b79ddf1..6e0ed40 100644
--- a/gr-basic/lib/gr_basic_divide.cc
+++ b/gr-basic/lib/gr_basic_divide.cc
@@ -69,7 +69,7 @@ private:
 };
 
 /***********************************************************************
- * Adder factory function
+ * factory function
  **********************************************************************/
 gr_basic_divide::sptr gr_basic_divide::make(op_type type, const size_t vlen){
     switch(type){
diff --git a/gr-basic/lib/gr_basic_multiply.cc 
b/gr-basic/lib/gr_basic_multiply.cc
index 81dc2f6..1588d9d 100644
--- a/gr-basic/lib/gr_basic_multiply.cc
+++ b/gr-basic/lib/gr_basic_multiply.cc
@@ -151,7 +151,7 @@ private:
 };
 
 /***********************************************************************
- * Adder factory function
+ * factory function
  **********************************************************************/
 gr_basic_multiply::sptr gr_basic_multiply::make(op_type type, const size_t 
vlen){
     switch(type){
diff --git a/gr-basic/lib/gr_basic_multiply_const.cc 
b/gr-basic/lib/gr_basic_multiply_const.cc
index 2689941..f1878d8 100644
--- a/gr-basic/lib/gr_basic_multiply_const.cc
+++ b/gr-basic/lib/gr_basic_multiply_const.cc
@@ -181,7 +181,7 @@ protected:
 };
 
 /***********************************************************************
- * Adder factory function
+ * factory function
  **********************************************************************/
 gr_basic_multiply_const::sptr gr_basic_multiply_const::make(op_type type, 
const size_t vlen){
 
diff --git a/gr-basic/lib/gr_basic_subtract.cc 
b/gr-basic/lib/gr_basic_subtract.cc
index 2476a5e..c16758b 100644
--- a/gr-basic/lib/gr_basic_subtract.cc
+++ b/gr-basic/lib/gr_basic_subtract.cc
@@ -69,7 +69,7 @@ private:
 };
 
 /***********************************************************************
- * Adder factory function
+ * factory function
  **********************************************************************/
 gr_basic_subtract::sptr gr_basic_subtract::make(op_type type, const size_t 
vlen){
     switch(type){
diff --git a/gr-filter/lib/gr_filter_decim_fir.cc 
b/gr-filter/lib/gr_filter_decim_fir.cc
index ac2b362..483079f 100644
--- a/gr-filter/lib/gr_filter_decim_fir.cc
+++ b/gr-filter/lib/gr_filter_decim_fir.cc
@@ -19,10 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
-#define LV_HAVE_GENERIC
-#include <volk/volk_32fc_x2_dot_prod_32fc_a.h>
-
 #include <gr_filter_decim_fir.h>
 #include <gr_io_signature.h>
 #include <gruel/thread.h>
@@ -76,9 +72,6 @@ public:
         for (size_t i = 0; i < taps.size(); i++){
             _taps[i] = type(taps[i]);
         }
-        while (_taps.size() % (volk_get_alignment() / sizeof(type)) != 0){
-            _taps.push_back(0.0);
-        }
         std::reverse(_taps.begin(), _taps.end());
         this->set_history(_taps.size());
     }
@@ -133,9 +126,6 @@ public:
         for (size_t i = 0; i < taps.size(); i++){
             _taps[i] = type(taps[i].real());
         }
-        while (_taps.size() % (volk_get_alignment() / sizeof(type)) != 0){
-            _taps.push_back(0.0);
-        }
         std::reverse(_taps.begin(), _taps.end());
         this->set_history(_taps.size());
     }