diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-07-18 23:36:16 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-07-18 23:36:16 +0200 |
| commit | 9d109d386e465dc4ea46159b0a7191ac30454a6d (patch) | |
| tree | 20ebf9c3283a237d4e6c1536846bdca0c5f4d236 /src/DabMultiplexer.cpp | |
| parent | 9d2beec11b78e44742d8242e0c8da2633a9162cf (diff) | |
| download | dabmux-9d109d386e465dc4ea46159b0a7191ac30454a6d.tar.gz dabmux-9d109d386e465dc4ea46159b0a7191ac30454a6d.tar.bz2 dabmux-9d109d386e465dc4ea46159b0a7191ac30454a6d.zip | |
Use new FIG carousel for FIB0 in DabMultiplexer
Diffstat (limited to 'src/DabMultiplexer.cpp')
| -rw-r--r-- | src/DabMultiplexer.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index 89c32c2..a44f8b2 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -86,11 +86,11 @@ DabMultiplexer::DabMultiplexer( sync(0x49C5F8), currentFrame(0), insertFIG(0), - rotateFIB(0) + rotateFIB(0), + ensemble(boost::make_shared<dabEnsemble>()), + fig_carousel(ensemble) { prepare_watermark(); - - ensemble = boost::make_shared<dabEnsemble>(); } void DabMultiplexer::prepare_watermark() @@ -631,7 +631,13 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu unsigned char figSize = 0; // FIB 0 Insertion - switch (insertFIG) { + bool new_fib0_carousel = m_pt.get("general.new_fib0_carousel", false); + if (new_fib0_carousel) { + fig_carousel.fib0(&etiFrame[index], 30, currentFrame % 4); + } + // Skip creating a block for the else because + // I don't want to reindent the whole switch block + else switch (insertFIG) { case 0: case 4: |