diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-fft/lib | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-fft/lib')
| -rw-r--r-- | gr-fft/lib/fft.cc | 6 | ||||
| -rw-r--r-- | gr-fft/lib/fft_vcc_fftw.cc | 8 | ||||
| -rw-r--r-- | gr-fft/lib/fft_vfc_fftw.cc | 8 | ||||
| -rw-r--r-- | gr-fft/lib/goertzel_fc_impl.cc | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc index 60838ee302..b3d0f04bc0 100644 --- a/gr-fft/lib/fft.cc +++ b/gr-fft/lib/fft.cc @@ -21,7 +21,7 @@ */ #include <fft/fft.h> -#include <gr_sys_paths.h> +#include <gnuradio/sys_paths.h> #include <fftw3.h> #ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom @@ -36,7 +36,7 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); } #define fftwl_import_wisdom_from_file(f) fftwl_import_wisdom(my_fftw_read_char, (void*) (f)) #endif //_MSC_VER -#include <gr_complex.h> +#include <gnuradio/gr_complex.h> #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -86,7 +86,7 @@ namespace gr { wisdom_filename() { static fs::path path; - path = fs::path(gr_appdata_path()) / ".gr_fftw_wisdom"; + path = fs::path(gr::appdata_path()) / ".gr_fftw_wisdom"; return path.string().c_str(); } diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc index ebcd5ec53f..96f3e5b51c 100644 --- a/gr-fft/lib/fft_vcc_fftw.cc +++ b/gr-fft/lib/fft_vcc_fftw.cc @@ -25,7 +25,7 @@ #endif #include "fft_vcc_fftw.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <math.h> #include <string.h> @@ -44,9 +44,9 @@ namespace gr { fft_vcc_fftw::fft_vcc_fftw(int fft_size, bool forward, const std::vector<float> &window, bool shift, int nthreads) - : gr_sync_block("fft_vcc_fftw", - gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex)), - gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))), + : sync_block("fft_vcc_fftw", + io_signature::make(1, 1, fft_size * sizeof(gr_complex)), + io_signature::make(1, 1, fft_size * sizeof(gr_complex))), d_fft_size(fft_size), d_forward(forward), d_shift(shift) { d_fft = new fft_complex(d_fft_size, forward, nthreads); diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc index 890dac7be7..dec2157b06 100644 --- a/gr-fft/lib/fft_vfc_fftw.cc +++ b/gr-fft/lib/fft_vfc_fftw.cc @@ -25,7 +25,7 @@ #endif #include "fft_vfc_fftw.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <math.h> #include <string.h> @@ -44,9 +44,9 @@ namespace gr { fft_vfc_fftw::fft_vfc_fftw(int fft_size, bool forward, const std::vector<float> &window, int nthreads) - : gr_sync_block("fft_vfc_fftw", - gr_make_io_signature(1, 1, fft_size * sizeof(float)), - gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))), + : sync_block("fft_vfc_fftw", + io_signature::make(1, 1, fft_size * sizeof(float)), + io_signature::make(1, 1, fft_size * sizeof(gr_complex))), d_fft_size(fft_size), d_forward(forward) { d_fft = new fft_complex(d_fft_size, forward, nthreads); diff --git a/gr-fft/lib/goertzel_fc_impl.cc b/gr-fft/lib/goertzel_fc_impl.cc index ee214f24da..fd3755eeaa 100644 --- a/gr-fft/lib/goertzel_fc_impl.cc +++ b/gr-fft/lib/goertzel_fc_impl.cc @@ -25,7 +25,7 @@ #endif #include "goertzel_fc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace fft { @@ -36,9 +36,9 @@ namespace gr { } goertzel_fc_impl::goertzel_fc_impl(int rate, int len, float freq) - : gr_sync_decimator("goertzel_fc", - gr_make_io_signature (1, 1, sizeof(float)), - gr_make_io_signature (1, 1, sizeof(gr_complex)), + : sync_decimator("goertzel_fc", + io_signature::make (1, 1, sizeof(float)), + io_signature::make (1, 1, sizeof(gr_complex)), len), d_goertzel(rate, len, freq) { |