diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-07-02 17:18:08 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-07-02 17:18:08 +0200 |
| commit | c9ef2a5b36d9082b2c2c853934a0332aef6564a6 (patch) | |
| tree | 28561b9aa7092e76450bf31af878ce75e63465f8 /src/DabModulator.cpp | |
| parent | f8719227d8cb9a228adae3472b7e754aa204d9de (diff) | |
| download | dabmod-c9ef2a5b36d9082b2c2c853934a0332aef6564a6.tar.gz dabmod-c9ef2a5b36d9082b2c2c853934a0332aef6564a6.tar.bz2 dabmod-c9ef2a5b36d9082b2c2c853934a0332aef6564a6.zip | |
Add digital gain to remote control
Diffstat (limited to 'src/DabModulator.cpp')
| -rw-r--r-- | src/DabModulator.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index e41f999..7f246d8 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -56,7 +56,8 @@ DabModulator::DabModulator( BaseRemoteController* rc, Logger& logger, unsigned outputRate, unsigned clockRate, - unsigned dabMode, GainMode gainMode, float factor, + unsigned dabMode, GainMode gainMode, + float digGain, float normalise, std::string filterTapsFilename ) : ModCodec(ModFormat(1), ModFormat(0)), @@ -65,7 +66,8 @@ DabModulator::DabModulator( myClockRate(clockRate), myDabMode(dabMode), myGainMode(gainMode), - myFactor(factor), + myDigGain(digGain), + myNormalise(normalise), myEtiReader(EtiReader(modconf, myLogger)), myFlowgraph(NULL), myFilterTapsFilename(filterTapsFilename), @@ -198,7 +200,9 @@ int DabModulator::process(Buffer* const dataIn, Buffer* dataOut) } cifOfdm = new OfdmGenerator((1 + myNbSymbols), myNbCarriers, mySpacing); - cifGain = new GainControl(mySpacing, myGainMode, myFactor); + cifGain = new GainControl(mySpacing, myGainMode, myDigGain, myNormalise); + cifGain->enrol_at(*myRC); + cifGuard = new GuardIntervalInserter(myNbSymbols, mySpacing, myNullSize, mySymSize); if (myFilterTapsFilename != "") { |