From eeb243ea7edce7be3ed84ef619704077e95213f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 1 Nov 2020 00:45:19 +0100 Subject: [PATCH] Use namepsace instead empty class --- sdrbase/CMakeLists.txt | 1 + sdrbase/dsp/firfilter.cpp | 7 ++++++- sdrbase/dsp/firfilter.h | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index ab08c08ab..167cc445c 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -270,6 +270,7 @@ set(sdrbase_HEADERS dsp/inthalfbandfiltersti.h dsp/kissfft.h dsp/kissengine.h + dsp/firfilter.h dsp/mimochannel.h dsp/misc.h dsp/movingaverage.h diff --git a/sdrbase/dsp/firfilter.cpp b/sdrbase/dsp/firfilter.cpp index 1ab072b8d..ef3092583 100644 --- a/sdrbase/dsp/firfilter.cpp +++ b/sdrbase/dsp/firfilter.cpp @@ -18,7 +18,10 @@ #include "firfilter.h" -void FirFilterGenerators::generateLowPassFilter(int nTaps, double sampleRate, double cutoff, std::vector &taps) +namespace FirFilterGenerators +{ + +void generateLowPassFilter(int nTaps, double sampleRate, double cutoff, std::vector &taps) { if (!(nTaps & 1)) { @@ -50,3 +53,5 @@ void FirFilterGenerators::generateLowPassFilter(int nTaps, double sampleRate, do taps[i] *= 0.42 + 0.5 * cos((2.0 * M_PI * n) / nTaps) + 0.08 * cos((4.0 * M_PI * n) / nTaps); } } + +} diff --git a/sdrbase/dsp/firfilter.h b/sdrbase/dsp/firfilter.h index be400a68e..0ba6334a5 100644 --- a/sdrbase/dsp/firfilter.h +++ b/sdrbase/dsp/firfilter.h @@ -23,10 +23,9 @@ #include "dsp/dsptypes.h" #include "export.h" -class SDRBASE_API FirFilterGenerators +namespace FirFilterGenerators { -public: - static void generateLowPassFilter(int nTaps, double sampleRate, double cutoff, std::vector &taps); + SDRBASE_API void generateLowPassFilter(int nTaps, double sampleRate, double cutoff, std::vector &taps); }; template