[Commit-gnuradio] [gnuradio] 02/02: qtgui: remove direct calls to aligned volk kernels; using dispatchers instead.

[git]

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

trondeau pushed a commit to branch maint
in repository gnuradio.

commit 0ad9d3e0ebe0eb02e800b194f6218e86526a2e06
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 22 15:55:09 2014 -0500

    qtgui: remove direct calls to aligned volk kernels; using dispatchers 
instead.
    
    Addresses problem of using FFTW buffers on AVX machines (when FFTW is not 
built with AVX).
    
    Addresses Issue #645.
---
 gr-qtgui/lib/sink_c_impl.cc | 6 +++---
 gr-qtgui/lib/sink_f_impl.cc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
index ed2512b..c1ee694 100644
--- a/gr-qtgui/lib/sink_c_impl.cc
+++ b/gr-qtgui/lib/sink_c_impl.cc
@@ -265,7 +265,7 @@ namespace gr {
     sink_c_impl::fft(float *data_out, const gr_complex *data_in, int size)
     {
       if (d_window.size()) {
-       volk_32fc_32f_multiply_32fc_a(d_fft->get_inbuf(), data_in,
+       volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), data_in,
                                      &d_window.front(), size);
       }
       else {
@@ -273,8 +273,8 @@ namespace gr {
       }
 
       d_fft->execute ();     // compute the fft
-      volk_32fc_s32f_x2_power_spectral_density_32f_a(data_out, 
d_fft->get_outbuf(),
-                                                    size, 1.0, size);
+      volk_32fc_s32f_x2_power_spectral_density_32f(data_out, 
d_fft->get_outbuf(),
+                                                   size, 1.0, size);
 }
 
     void
diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
index e2263f7..d9bc526 100644
--- a/gr-qtgui/lib/sink_f_impl.cc
+++ b/gr-qtgui/lib/sink_f_impl.cc
@@ -268,8 +268,8 @@ namespace gr {
       }
 
       d_fft->execute ();     // compute the fft
-      volk_32fc_s32f_x2_power_spectral_density_32f_a(data_out, 
d_fft->get_outbuf(),
-                                                    size, 1.0, size);
+      volk_32fc_s32f_x2_power_spectral_density_32f(data_out, 
d_fft->get_outbuf(),
+                                                   size, 1.0, size);
     }
 
     void