From 1cfebd56f205f95498079a20bca1a0667be07296 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Thu, 17 Aug 2017 16:15:54 +0200 Subject: Simplify DabModulator ctor signature --- src/DabMod.cpp | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'src/DabMod.cpp') diff --git a/src/DabMod.cpp b/src/DabMod.cpp index 7c342a2..15b3be2 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -317,18 +317,7 @@ int launch_modulator(int argc, char* argv[]) } Flowgraph flowgraph; - auto modulator = make_shared( - ediReader, - mod_settings.tiiConfig, - mod_settings.outputRate, - mod_settings.clockRate, - mod_settings.dabMode, - mod_settings.gainMode, - mod_settings.digitalgain, - mod_settings.normalise, - mod_settings.gainmodeVariance, - mod_settings.filterTapsFilename, - mod_settings.polyCoefFilename); + auto modulator = make_shared(ediReader, mod_settings); if (format_converter) { flowgraph.connect(modulator, format_converter); @@ -422,18 +411,7 @@ int launch_modulator(int argc, char* argv[]) m.etiReader = &etiReader; auto input = make_shared(&m.data); - auto modulator = make_shared( - etiReader, - mod_settings.tiiConfig, - mod_settings.outputRate, - mod_settings.clockRate, - mod_settings.dabMode, - mod_settings.gainMode, - mod_settings.digitalgain, - mod_settings.normalise, - mod_settings.gainmodeVariance, - mod_settings.filterTapsFilename, - mod_settings.polyCoefFilename); + auto modulator = make_shared(etiReader, mod_settings); if (format_converter) { flowgraph.connect(modulator, format_converter); -- cgit v1.2.3