diff options
author | Tom Rondeau | 2012-05-02 16:14:09 -0400 |
---|---|---|
committer | Tom Rondeau | 2012-05-02 16:14:09 -0400 |
commit | 32f807a8c8f1bcadfd8f8ad4c5a46c1b099f8c8f (patch) | |
tree | 9b310ec42d0532831e20e6c6f2f184e9d2463a54 /gr-filter/swig | |
parent | a247889d7ad212cf3a69df8ec95dc2436e4cc400 (diff) | |
download | gnuradio-32f807a8c8f1bcadfd8f8ad4c5a46c1b099f8c8f.tar.gz gnuradio-32f807a8c8f1bcadfd8f8ad4c5a46c1b099f8c8f.tar.bz2 gnuradio-32f807a8c8f1bcadfd8f8ad4c5a46c1b099f8c8f.zip |
filter: Reworking filter to have a set of basic implementation classes for filters of different kinds.
The GR blocks are templated now and call from fir_filters for the volk-specific implemenation.
Note the modification to build_utils.py to accomodate these changes.
Diffstat (limited to 'gr-filter/swig')
-rw-r--r-- | gr-filter/swig/CMakeLists.txt | 2 | ||||
-rw-r--r-- | gr-filter/swig/filter_swig.i | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt index 5dff9f631..3eee3a1ee 100644 --- a/gr-filter/swig/CMakeLists.txt +++ b/gr-filter/swig/CMakeLists.txt @@ -24,7 +24,7 @@ include(GrPython) include(GrSwig) set(GR_SWIG_INCLUDE_DIRS - ${FILTER_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${FFT_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i index 55ee3c56c..28268528a 100644 --- a/gr-filter/swig/filter_swig.i +++ b/gr-filter/swig/filter_swig.i @@ -29,8 +29,14 @@ %{ #include "filter/fir_filter_fff.h" +#include "filter/fir_filter_ccf.h" +#include "filter/fir_filter_ccc.h" %} %include "filter/fir_filter_fff.h" +%include "filter/fir_filter_ccf.h" +%include "filter/fir_filter_ccc.h" GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_fff); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccf); +GR_SWIG_BLOCK_MAGIC2(filter, fir_filter_ccc); |