Add support for services with different ECC in FIG0/9

1 files changed, 17 insertions, 3 deletions

diff --git a/src/fig/FIG0_9.h b/src/fig/FIG0_9.h
index 0a71fa0..ebbf81f 100644
--- a/src/fig/FIG0_9.h
+++ b/src/fig/FIG0_9.h
@@ -3,7 +3,7 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Copyright (C) 2016
+   Copyright (C) 2018
    Matthias P. Braendli, matthias.braendli@mpb.li
    */
 /*
@@ -26,13 +26,15 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
+#include <map>
+#include <list>
 
 namespace FIC {
 
 // FIG type 0/9
 // The Country, LTO and International table feature defines the local time
-// offset, the International Table and the Extended Country Code (ECC)
+// offset, the International Table and the Extended Country Code (ECC) for
+// the ensemble. Also, the ECC for services with differing ECC.
 class FIG0_9 : public IFIG
 {
     public:
@@ -45,6 +47,18 @@ class FIG0_9 : public IFIG
 
     private:
         FIGRuntimeInformation *m_rti;
+
+        struct FIG0_9_Extended_Field {
+            uint8_t ecc;
+            std::list<uint16_t> sids;
+
+            size_t required_bytes() const {
+                return 2 + 2 * sids.size();
+            }
+        };
+        std::list<FIG0_9_Extended_Field> m_extended_fields;
+        std::list<FIG0_9_Extended_Field>::iterator m_current_extended_field;
+
 };
 
 }