diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-12-25 23:53:51 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-12-25 23:53:51 +0100 |
commit | fd6d695275f88e83ebba6fa39afc044e329a690f (patch) | |
tree | 38ac7b49407970cb3c0b2b66972653a37d0d1fd5 /src/DabMod.cpp | |
parent | eaf1c41bde2b58446697360af454266c4dc594a4 (diff) | |
download | dabmod-fd6d695275f88e83ebba6fa39afc044e329a690f.tar.gz dabmod-fd6d695275f88e83ebba6fa39afc044e329a690f.tar.bz2 dabmod-fd6d695275f88e83ebba6fa39afc044e329a690f.zip |
Add first version of EDI input
Diffstat (limited to 'src/DabMod.cpp')
-rw-r--r-- | src/DabMod.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index fc28218..e44ed20 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -187,6 +187,7 @@ int launch_modulator(int argc, char* argv[]) auto inputZeroMQReader = make_shared<InputZeroMQReader>(); #endif + auto inputEdiReader = make_shared<InputEdiReader>(); auto inputTcpReader = make_shared<InputTcpReader>(); struct sigaction sa; @@ -712,6 +713,10 @@ int launch_modulator(int argc, char* argv[]) inputTcpReader->Open(inputName); m.inputReader = inputTcpReader.get(); } + else if (inputTransport == "edi") { + inputEdiReader->Open(inputName); + m.inputReader = inputEdiReader.get(); + } else { fprintf(stderr, "Error, invalid input transport %s selected!\n", inputTransport.c_str()); @@ -770,11 +775,11 @@ int launch_modulator(int argc, char* argv[]) m.flowgraph = &flowgraph; m.data.setLength(6144); - shared_ptr<InputMemory> input(new InputMemory(&m.data)); - shared_ptr<DabModulator> modulator( - new DabModulator(tist_offset_s, tist_delay_stages, - tiiConfig, outputRate, clockRate, dabMode, gainMode, - digitalgain, normalise, filterTapsFilename)); + auto input = make_shared<InputMemory>(&m.data); + auto modulator = make_shared<DabModulator>( + tist_offset_s, tist_delay_stages, + tiiConfig, outputRate, clockRate, dabMode, gainMode, + digitalgain, normalise, filterTapsFilename); flowgraph.connect(input, modulator); if (format_converter) { |