From 5f8be01b3dfa32a63b142efad9feeffae663d62f Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 16 Feb 2018 11:55:58 +0100 Subject: Do not detect TM from ETI, default to TM 1 --- doc/example.ini | 2 +- src/ConfigParser.h | 2 +- src/DabModulator.cpp | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/doc/example.ini b/doc/example.ini index 7fa0721..624f29a 100644 --- a/doc/example.ini +++ b/doc/example.ini @@ -87,7 +87,7 @@ gainmode=var ;normalise_variance=4 ; Transmission mode -; If not defined, take the mode from ETI +; If not defined, use Transmission Mode 1 ;mode=1 ; The digital gain is a value that is multiplied to each sample. It is used diff --git a/src/ConfigParser.h b/src/ConfigParser.h index dc5ac4f..51afbc2 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -52,7 +52,7 @@ struct mod_settings_t { size_t outputRate = 2048000; size_t clockRate = 0; - unsigned dabMode = 0; + unsigned dabMode = 1; float digitalgain = 1.0f; float normalise = 1.0f; GainMode gainMode = GainMode::GAIN_VAR; diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index 4655b82..64c78af 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -121,12 +121,7 @@ int DabModulator::process(Buffer* dataOut) PDEBUG("DabModulator::process(dataOut: %p)\n", dataOut); if (not myFlowgraph) { - unsigned mode = myEtiSource.getMode(); - if (m_settings.dabMode != 0) { - mode = m_settings.dabMode; - } else if (mode == 0) { - mode = 4; - } + const unsigned mode = m_settings.dabMode; setMode(mode); myFlowgraph = make_shared(); -- cgit v1.2.3