diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-01-07 10:38:55 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-01-07 10:38:55 +0100 |
| commit | 8953a94893fe39a10b044ea62cf6971d36801880 (patch) | |
| tree | 0cd0ab921827400f3ada7449827bbffaa97e7450 /src/DabModulator.cpp | |
| parent | e0f9c8909ecba56da4c7a2ec3507b8af19b737bd (diff) | |
| parent | 0315433aef00644085d2278af405eaedbc184c5c (diff) | |
| download | dabmod-8953a94893fe39a10b044ea62cf6971d36801880.tar.gz dabmod-8953a94893fe39a10b044ea62cf6971d36801880.tar.bz2 dabmod-8953a94893fe39a10b044ea62cf6971d36801880.zip | |
Merge branch 'flowgraphmetadata' into outputRefactoring
Diffstat (limited to 'src/DabModulator.cpp')
| -rw-r--r-- | src/DabModulator.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index 1ea06de..337a595 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -3,7 +3,7 @@ Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2018 Matthias P. Braendli, matthias.braendli@mpb.li http://opendigitalradio.org @@ -221,7 +221,7 @@ int DabModulator::process(Buffer* dataOut) rcs.enrol(cifPoly.get()); } - auto myOutput = make_shared<OutputMemory>(dataOut); + myOutput = make_shared<OutputMemory>(dataOut); shared_ptr<Resampler> cifRes; if (m_settings.outputRate != 2048000) { @@ -376,3 +376,12 @@ int DabModulator::process(Buffer* dataOut) return myFlowgraph->run(); } +meta_vec_t DabModulator::process_metadata(const meta_vec_t& metadataIn) +{ + if (myOutput) { + return myOutput->get_latest_metadata(); + } + + return {}; +} + |