[Commit-gnuradio] [gnuradio] 01/02: qtgui: removing all references to aligned volk calls -- which I thought that I had already done.

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit b8bcf8bbec1c89ff5ededc7cbf75b4504849aeb0
Author: Tom Rondeau <address@hidden>
Date:   Sun Feb 1 09:15:07 2015 -0500

    qtgui: removing all references to aligned volk calls -- which I thought 
that I had already done.
---
 gr-qtgui/lib/SpectrumGUIClass.cc      | 8 ++++----
 gr-qtgui/lib/freq_sink_c_impl.cc      | 2 +-
 gr-qtgui/lib/freq_sink_f_impl.cc      | 2 +-
 gr-qtgui/lib/waterfall_sink_c_impl.cc | 2 +-
 gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index 5272d8a..4fe8628 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -266,10 +266,10 @@ SpectrumGUIClass::updateWindow(const bool 
updateDisplayFlag,
     }
 
     if((complexTimeDomainData != NULL) && (complexTimeDomainDataSize > 0)) {
-      volk_32fc_deinterleave_64f_x2_a(_realTimeDomainPoints,
-                                      _imagTimeDomainPoints,
-                                     (const lv_32fc_t *)complexTimeDomainData,
-                                     complexTimeDomainDataSize);
+      volk_32fc_deinterleave_64f_x2(_realTimeDomainPoints,
+                                    _imagTimeDomainPoints,
+                                    (const lv_32fc_t *)complexTimeDomainData,
+                                    complexTimeDomainDataSize);
       timeDomainBufferSize = complexTimeDomainDataSize;
     }
   }
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index e46b9db..fa8e38d 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -641,7 +641,7 @@ namespace gr {
             for(int x = 0; x < d_fftsize; x++) {
               d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + 
(d_fftavg)*d_fbuf[x]);
             }
-            //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+            //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
           }
 
           // Test trigger off signal power in d_magbufs
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 200b009..1df915b 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -646,7 +646,7 @@ namespace gr {
             for(int x = 0; x < d_fftsize; x++) {
               d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + 
(d_fftavg)*d_fbuf[x]);
             }
-            //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+            //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
           }
 
           // Test trigger off signal power in d_magbufs
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc 
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index a9a2d6c..e5d43f4 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -494,7 +494,7 @@ namespace gr {
               for(int x = 0; x < d_fftsize; x++) {
                 d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + 
(d_fftavg)*d_fbuf[x]);
               }
-              //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+              //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
             }
 
            d_last_time = gr::high_res_timer_now();
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc 
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index 0c1fbbf..adae592 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -465,7 +465,7 @@ namespace gr {
         }
       }
     }
-    
+
     void
     waterfall_sink_f_impl::set_time_per_fft(double t)
     {
@@ -502,7 +502,7 @@ namespace gr {
               for(int x = 0; x < d_fftsize; x++) {
                 d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + 
(d_fftavg)*d_fbuf[x]);
               }
-              //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+              //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
             }
 
            d_last_time = gr::high_res_timer_now();