From 466833a35a402347b7e2180ab265146eb0a3a59d Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Wed, 30 Jan 2019 10:43:49 +0100
Subject: Fix FIB2 component labels

---
 src/ensembledatabase.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/ensembledatabase.hpp')

diff --git a/src/ensembledatabase.hpp b/src/ensembledatabase.hpp
index dee434d..fff989f 100644
--- a/src/ensembledatabase.hpp
+++ b/src/ensembledatabase.hpp
@@ -94,11 +94,15 @@ struct subchannel_t {
 };
 
 struct component_t {
-    uint32_t service_id;
+    uint32_t service_id = 0;
     uint8_t subchId;
 
+    uint8_t scids = 255; // 255 is invalid, as scids is only 4 bits wide
+
     bool primary;
 
+    label_t label;
+
     /* TODO
     uint8_t type;
 
@@ -114,7 +118,8 @@ struct service_t {
 
     std::list<component_t> components;
 
-    component_t& get_component(uint32_t subchannel_id);
+    component_t& get_component_by_subchannel(uint32_t subchannel_id);
+    component_t& get_component_by_scids(uint8_t scids);
     component_t& get_or_create_component(uint32_t subchannel_id);
 
     // TODO PTy language announcement
-- 
cgit v1.2.3