diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-26 15:52:55 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-26 15:52:55 +0200 |
| commit | c203ead5bbc6144fe63de2ae713bf54e4dd2c996 (patch) | |
| tree | 08ec84520d308aa775755829dc8b2857962aac37 /src/DabMod.cpp | |
| parent | 177eb8d875a5513731e8c9b3019ca44d311e55c3 (diff) | |
| download | dabmod-c203ead5bbc6144fe63de2ae713bf54e4dd2c996.tar.gz dabmod-c203ead5bbc6144fe63de2ae713bf54e4dd2c996.tar.bz2 dabmod-c203ead5bbc6144fe63de2ae713bf54e4dd2c996.zip | |
Add TII to remote control, add explicit enable
Diffstat (limited to 'src/DabMod.cpp')
| -rw-r--r-- | src/DabMod.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index 618e0fe..01125b2 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -132,8 +132,7 @@ int launch_modulator(int argc, char* argv[]) float normalise = 1.0f; GainMode gainMode = GAIN_VAR; - int tiiPattern = 0; - int tiiComb = 0; + tii_config_t tiiConfig; /* UHD requires the input I and Q samples to be in the interval * [-1.0,1.0], otherwise they get truncated, which creates very @@ -582,8 +581,9 @@ int launch_modulator(int argc, char* argv[]) #endif /* Read TII parameters from config file */ - tiiComb = pt.get("tii.comb", 0); - tiiPattern = pt.get("tii.pattern", 0); + tiiConfig.enable = pt.get("tii.enable", 0); + tiiConfig.comb = pt.get("tii.comb", 0); + tiiConfig.pattern = pt.get("tii.pattern", 0); } if (rcs.get_no_controllers() == 0) { @@ -755,8 +755,8 @@ int launch_modulator(int argc, char* argv[]) shared_ptr<InputMemory> input(new InputMemory(&m.data)); shared_ptr<DabModulator> modulator( new DabModulator(tist_offset_s, tist_delay_stages, &rcs, - outputRate, clockRate, dabMode, gainMode, digitalgain, - normalise, filterTapsFilename, tiiComb, tiiPattern)); + tiiConfig, outputRate, clockRate, dabMode, gainMode, + digitalgain, normalise, filterTapsFilename)); flowgraph.connect(input, modulator); if (format_converter) { |