From 103841bc578888a828d176eddfdd9fa345549f03 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Wed, 23 Apr 2025 11:18:08 +0200
Subject: Rework FIG0/10 DAB time indication to match EDI time

---
 src/fig/FIG.h           | 10 +++++++++-
 src/fig/FIG0_10.cpp     | 11 +++++------
 src/fig/FIGCarousel.cpp |  7 +++++--
 src/fig/FIGCarousel.h   |  4 +++-
 4 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'src/fig')

diff --git a/src/fig/FIG.h b/src/fig/FIG.h
index 9752245..eda4671 100644
--- a/src/fig/FIG.h
+++ b/src/fig/FIG.h
@@ -35,11 +35,19 @@ namespace FIC {
 
 class FIGRuntimeInformation {
     public:
-        FIGRuntimeInformation(std::shared_ptr<dabEnsemble>& e) :
+
+        using dab_time_t = std::pair<uint32_t /* milliseconds */, time_t>;
+        using get_time_func_t = std::function<dab_time_t()>;
+
+        FIGRuntimeInformation(
+                std::shared_ptr<dabEnsemble>& e,
+                get_time_func_t getTimeFunc) :
+            getTimeFunc(getTimeFunc),
             currentFrame(0),
             ensemble(e),
             factumAnalyzer(false) {}
 
+        get_time_func_t getTimeFunc;
         unsigned long currentFrame;
         std::shared_ptr<dabEnsemble> ensemble;
         bool factumAnalyzer;
diff --git a/src/fig/FIG0_10.cpp b/src/fig/FIG0_10.cpp
index 56ce9fb..240aa19 100644
--- a/src/fig/FIG0_10.cpp
+++ b/src/fig/FIG0_10.cpp
@@ -3,7 +3,7 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Copyright (C) 2016
+   Copyright (C) 2025
    Matthias P. Braendli, matthias.braendli@mpb.li
    */
 /*
@@ -23,7 +23,6 @@
    along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "fig/FIG0structs.h"
 #include "fig/FIG0_10.h"
 #include "utils.h"
 
@@ -89,7 +88,7 @@ FillStatus FIG0_10::fill(uint8_t *buf, size_t max_size)
         return fs;
     }
 
-    //Time and country identifier
+    // Time and country identifier
     auto fig0_10 = (FIGtype0_10_LongForm*)buf;
 
     fig0_10->FIGtypeNumber = 0;
@@ -102,9 +101,9 @@ FillStatus FIG0_10::fill(uint8_t *buf, size_t max_size)
     remaining -= 2;
 
     struct tm timeData;
-    time_t dab_time_seconds = 0;
-    uint32_t dab_time_millis = 0;
-    get_dab_time(&dab_time_seconds, &dab_time_millis);
+    const auto dab_time = m_rti->getTimeFunc();
+    time_t dab_time_seconds = dab_time.second;
+    uint32_t dab_time_millis = dab_time.first;
     gmtime_r(&dab_time_seconds, &timeData);
 
     fig0_10->RFU = 0;
diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp
index 9748dbf..ceda275 100644
--- a/src/fig/FIGCarousel.cpp
+++ b/src/fig/FIGCarousel.cpp
@@ -68,8 +68,11 @@ bool FIGCarouselElement::check_deadline()
 
 /**************** FIGCarousel *****************/
 
-FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> ensemble) :
-    m_rti(ensemble),
+FIGCarousel::FIGCarousel(
+        std::shared_ptr<dabEnsemble> ensemble,
+        FIGRuntimeInformation::get_time_func_t getTimeFunc
+        ) :
+    m_rti(ensemble, getTimeFunc),
     m_fig0_0(&m_rti),
     m_fig0_1(&m_rti),
     m_fig0_2(&m_rti),
diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h
index 1e33577..a2a8022 100644
--- a/src/fig/FIGCarousel.h
+++ b/src/fig/FIGCarousel.h
@@ -67,7 +67,9 @@ enum class FIBAllocation {
 
 class FIGCarousel {
     public:
-        FIGCarousel(std::shared_ptr<dabEnsemble> ensemble);
+        FIGCarousel(
+                std::shared_ptr<dabEnsemble> ensemble,
+                FIGRuntimeInformation::get_time_func_t getTimeFunc);
 
         /* Write all FIBs to the buffer, including correct padding and crc.
          * Returns number of bytes written.
-- 
cgit v1.2.3