From 02d96cb7b6a73595e5c517a3e352f578aa5497a0 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 7 Aug 2015 11:37:50 +0200
Subject: Start FIB1, add FIG0/8

---
 src/DabMultiplexer.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/DabMultiplexer.cpp')

diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index ccf3594..3dbe325 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -631,10 +631,10 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
     unsigned char figSize = 0;
 
     // FIB 0 Insertion
-    bool new_fib0_carousel = m_pt.get("general.new_fib0_carousel", false);
-    if (new_fib0_carousel) {
-        // TODO update currentframe in rti
-        figSize += fig_carousel.fib0(&etiFrame[index], 30, currentFrame % 4);
+    bool new_fig_carousel = m_pt.get("general.new_fig_carousel", false);
+    if (new_fig_carousel) {
+        fig_carousel.set_currentFrame(currentFrame);
+        figSize += fig_carousel.carousel(0, &etiFrame[index], 30, currentFrame % 4);
         index += figSize;
     }
     // Skip creating a block for the else because
@@ -1129,7 +1129,10 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
 
     figSize = 0;
     // FIB 1 insertion
-    switch (rotateFIB) {
+    if (new_fig_carousel) {
+        figSize += fig_carousel.carousel(1, &etiFrame[index], 30, currentFrame % 4);
+        index += figSize;
+    } else switch (rotateFIB) {
         case 0:     // FIG 0/8 program
             fig0 = NULL;
 
-- 
cgit v1.2.3