Remove references to nonfunctional FIDC

3 files changed, 4 insertions, 15 deletions

diff --git a/src/fig/FIG0_2.cpp b/src/fig/FIG0_2.cpp
index 5275a22..0b6cd87 100644
--- a/src/fig/FIG0_2.cpp
+++ b/src/fig/FIG0_2.cpp
@@ -107,15 +107,6 @@ FillStatus FIG0_2::fill(uint8_t *buf, size_t max_size)
     etiLog.level(FIG0_2_TRACE) << "FIG0_2::fill init " << (m_initialised ? 1 : 0) <<
         " ********************************";
 
-    for (const auto& s : ensemble->services) {
-        // Exclude Fidc type services, TODO unsupported
-        auto type = s->getType(ensemble);
-        if (type == subchannel_type_t::Fidc) {
-            etiLog.log(warn, "FIG0/2 does not support FIDC");
-            continue;
-        }
-    }
-
     if (not m_initialised) {
         m_audio_services.clear();
         copy_if(ensemble->services.begin(),
@@ -164,8 +155,7 @@ FillStatus FIG0_2::fill(uint8_t *buf, size_t max_size)
                 type == subchannel_type_t::DABPlusAudio ? "DABPlusAudio" :
                 type == subchannel_type_t::DABAudio ? "DABAudio" :
                 type == subchannel_type_t::Packet ? "Packet" :
-                type == subchannel_type_t::DataDmb ? "DataDmb" :
-                type == subchannel_type_t::Fidc ? "Fidc" : "?");
+                type == subchannel_type_t::DataDmb ? "DataDmb" : "?");
 
         // filter out services which have no components
         if ((*serviceFIG0_2)->nbComponent(ensemble->components) == 0) {
diff --git a/src/fig/FIG0_24.cpp b/src/fig/FIG0_24.cpp
index 960d261..291b07b 100644
--- a/src/fig/FIG0_24.cpp
+++ b/src/fig/FIG0_24.cpp
@@ -109,8 +109,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size)
                 m_inserting_audio_not_data ? "AUDIO" : "DATA",
                 type == subchannel_type_t::DABAudio ? "Audio" :
                 type == subchannel_type_t::Packet ? "Packet" :
-                type == subchannel_type_t::DataDmb ? "DataDmb" :
-                type == subchannel_type_t::Fidc ? "Fidc" : "?");
+                type == subchannel_type_t::DataDmb ? "DataDmb" : "?");
 
         if (last_oe != oe) {
             fig0 = nullptr;
diff --git a/src/fig/FIG0_8.cpp b/src/fig/FIG0_8.cpp
index fdb3623..c2f8365 100644
--- a/src/fig/FIG0_8.cpp
+++ b/src/fig/FIG0_8.cpp
@@ -133,7 +133,7 @@ FillStatus FIG0_8::fill(uint8_t *buf, size_t max_size)
                 buf += 3;             // 8 minus rfa
                 remaining -= 3;
             }
-            else {    // Audio, data stream or FIDC
+            else {    // Audio, data stream
                 buf[0] = ((*componentFIG0_8)->serviceId >> 8) & 0xFF;
                 buf[1] = ((*componentFIG0_8)->serviceId) & 0xFF;
 
@@ -195,7 +195,7 @@ FillStatus FIG0_8::fill(uint8_t *buf, size_t max_size)
                 buf += 3;             // 8 minus rfa
                 remaining -= 3;
             }
-            else {    // Audio, data stream or FIDC
+            else {    // Audio, data stream
                 buf[0] = ((*componentFIG0_8)->serviceId >> 24) & 0xFF;
                 buf[1] = ((*componentFIG0_8)->serviceId >> 16) & 0xFF;
                 buf[2] = ((*componentFIG0_8)->serviceId >> 8) & 0xFF;