diff options
| author | Tom Rondeau <tom@trondeau.com> | 2015-02-01 09:15:07 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2015-02-01 09:22:11 -0500 |
| commit | b8bcf8bbec1c89ff5ededc7cbf75b4504849aeb0 (patch) | |
| tree | 5dff0e60c81e68afac53220e8ff33f1932a7da18 | |
| parent | 80ee28e1490fa1aa7cac6e21506c2890ead9affd (diff) | |
qtgui: removing all references to aligned volk calls -- which I thought that I had already done.
| -rw-r--r-- | gr-qtgui/lib/SpectrumGUIClass.cc | 8 | ||||
| -rw-r--r-- | gr-qtgui/lib/freq_sink_c_impl.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/freq_sink_f_impl.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_c_impl.cc | 2 | ||||
| -rw-r--r-- | 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 5272d8ab30..4fe86283e5 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 e46b9db865..fa8e38dd9f 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 200b009d79..1df915b32c 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 a9a2d6c09e..e5d43f4662 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 0c1fbbff36..adae592bff 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(); |