diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2024-11-19 14:47:09 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2024-11-19 14:47:09 +0100 |
| commit | 46471d4ada2e7f0c12a74f829c8e12bb5c29cf89 (patch) | |
| tree | 407b9278520c858bfee02b6e085b92fd1bc18a49 | |
| parent | 101952b8277dede9c70a72a7f9e7a75ed3a291e0 (diff) | |
| download | dabmod-46471d4ada2e7f0c12a74f829c8e12bb5c29cf89.tar.gz dabmod-46471d4ada2e7f0c12a74f829c8e12bb5c29cf89.tar.bz2 dabmod-46471d4ada2e7f0c12a74f829c8e12bb5c29cf89.zip | |
Simplify OfdmGenerator constructors
| -rw-r--r-- | src/DabModulator.cpp | 10 | ||||
| -rw-r--r-- | src/OfdmGenerator.cpp | 6 | ||||
| -rw-r--r-- | src/OfdmGenerator.h | 6 |
3 files changed, 2 insertions, 20 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index e0a613f..5f7aaf6 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -209,20 +209,14 @@ int DabModulator::process(Buffer* dataOut) cifOfdm = make_shared<OfdmGeneratorFixed>( (1 + m_nbSymbols), m_nbCarriers, - m_spacing, - m_settings.enableCfr, - m_settings.cfrClip, - m_settings.cfrErrorClip); + m_spacing); break; case FFTEngine::DEXTER: #if defined(HAVE_DEXTER) cifOfdm = make_shared<OfdmGeneratorDEXTER>( (1 + m_nbSymbols), m_nbCarriers, - m_spacing, - m_settings.enableCfr, - m_settings.cfrClip, - m_settings.cfrErrorClip); + m_spacing); #else throw std::runtime_error("Cannot use DEXTER fft engine without --enable-dexter"); #endif diff --git a/src/OfdmGenerator.cpp b/src/OfdmGenerator.cpp index 16eb8d9..558ec1b 100644 --- a/src/OfdmGenerator.cpp +++ b/src/OfdmGenerator.cpp @@ -467,9 +467,6 @@ const json::map_t OfdmGeneratorCF32::get_all_values() const OfdmGeneratorFixed::OfdmGeneratorFixed(size_t nbSymbols, size_t nbCarriers, size_t spacing, - bool& enableCfr, - float& cfrClip, - float& cfrErrorClip, bool inverse) : ModCodec(), myNbSymbols(nbSymbols), @@ -693,9 +690,6 @@ void set_fft_accelerator_config(bool inverse) OfdmGeneratorDEXTER::OfdmGeneratorDEXTER(size_t nbSymbols, size_t nbCarriers, size_t spacing, - bool& enableCfr, - float& cfrClip, - float& cfrErrorClip, bool inverse) : ModCodec(), myNbSymbols(nbSymbols), diff --git a/src/OfdmGenerator.h b/src/OfdmGenerator.h index b8ec702..56e3cb2 100644 --- a/src/OfdmGenerator.h +++ b/src/OfdmGenerator.h @@ -113,9 +113,6 @@ class OfdmGeneratorFixed : public ModCodec OfdmGeneratorFixed(size_t nbSymbols, size_t nbCarriers, size_t spacing, - bool& enableCfr, - float& cfrClip, - float& cfrErrorClip, bool inverse = true); virtual ~OfdmGeneratorFixed(); OfdmGeneratorFixed(const OfdmGeneratorFixed&) = delete; @@ -150,9 +147,6 @@ class OfdmGeneratorDEXTER : public ModCodec OfdmGeneratorDEXTER(size_t nbSymbols, size_t nbCarriers, size_t spacing, - bool& enableCfr, - float& cfrClip, - float& cfrErrorClip, bool inverse = true); virtual ~OfdmGeneratorDEXTER(); OfdmGeneratorDEXTER(const OfdmGeneratorDEXTER&) = delete; |