summaryrefslogtreecommitdiffstats
path: root/src/DabModulator.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-08-17 16:15:54 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-08-17 16:15:54 +0200
commit1cfebd56f205f95498079a20bca1a0667be07296 (patch)
treecbf83a18380528af6678e58cf640467ed3eaacff /src/DabModulator.h
parent84c8d100c682fece37b448f38228260f84c070f2 (diff)
downloaddabmod-1cfebd56f205f95498079a20bca1a0667be07296.tar.gz
dabmod-1cfebd56f205f95498079a20bca1a0667be07296.tar.bz2
dabmod-1cfebd56f205f95498079a20bca1a0667be07296.zip
Simplify DabModulator ctor signature
Diffstat (limited to 'src/DabModulator.h')
-rw-r--r--src/DabModulator.h24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/DabModulator.h b/src/DabModulator.h
index e8048ac..6878853 100644
--- a/src/DabModulator.h
+++ b/src/DabModulator.h
@@ -36,6 +36,7 @@
#include <memory>
#include "ModPlugin.h"
+#include "ConfigParser.h"
#include "EtiReader.h"
#include "Flowgraph.h"
#include "GainControl.h"
@@ -48,15 +49,8 @@
class DabModulator : public ModInput
{
public:
- DabModulator(
- EtiSource& etiSource,
- tii_config_t& tiiConfig,
- unsigned outputRate, unsigned clockRate,
- unsigned dabMode, GainMode gainMode,
- float& digGain, float normalise,
- float gainmodeVariance,
- const std::string& filterTapsFilename,
- const std::string& polyCoefFilename);
+ DabModulator(EtiSource& etiSource,
+ const mod_settings_t& settings);
int process(Buffer* dataOut);
const char* name() { return "DabModulator"; }
@@ -67,18 +61,10 @@ public:
protected:
void setMode(unsigned mode);
- unsigned myOutputRate;
- unsigned myClockRate;
- unsigned myDabMode;
- GainMode myGainMode;
- float& myDigGain;
- float myNormalise;
- float myGainmodeVariance;
+ const mod_settings_t& m_settings;
+
EtiSource& myEtiSource;
std::shared_ptr<Flowgraph> myFlowgraph;
- std::string myFilterTapsFilename;
- std::string myPolyCoefFilename;
- tii_config_t& myTiiConfig;
size_t myNbSymbols;
size_t myNbCarriers;