Remove references to nonfunctional FIDC

8 files changed, 22 insertions, 43 deletions

diff --git a/doc/README.md b/doc/README.md
index ea02670..111be57 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -16,24 +16,24 @@ program services and 11 for data services. A service component is a link to one
 subchannel (or Fast Information Data Channel). A subchannel is the physical
 space used within the common interleaved frame.
 
-                         __________________________________________________
-     ENSEMBLE           |                   ODR-Ensemble                   |
-                        |__________________________________________________|
-                                |                 |                 |
-                                |                 |                 |
-                         _______V______    _______V______    _______V______
-     SERVICES           | ODR-Service1 |  | ODR-Service2 |  | ODR-Service3 |
-                        |______________|  |______________|  |______________|
-                           |        |        |        | |______         |
-                           |        |        |        |        |        |
-                         __V__    __V__    __V__    __V__    __V__    __V__
-     SERVICE            | SC1 |  | SC2 |  | SC3 |  | SC4 |  | SC5 |  | SC6 |
-     COMPONENTS         |_____|  |_____|  |_____|  |_____|  |_____|  |_____|
-                           |        |   _____|        |        |    ____|
-                           |        |  |              |        |   |
-     _________________   __V________V__V______________V________V___V_______
-    | MCI | SI | FIDC | | SubCh1 | SubCh9 |  ...  | SubCh3 | SubCh60 | ... |
-    |_____|____|______| |________|________|_______|________|_________|_____|
+                  __________________________________________________
+     ENSEMBLE    |                   ODR-Ensemble                   |
+                 |__________________________________________________|
+                         |                 |                 |
+                         |                 |                 |
+                  _______V______    _______V______    _______V______
+     SERVICES    | ODR-Service1 |  | ODR-Service2 |  | ODR-Service3 |
+                 |______________|  |______________|  |______________|
+                    |        |        |        | |______         |
+                    |        |        |        |        |        |
+                  __V__    __V__    __V__    __V__    __V__    __V__
+     SERVICE     | SC1 |  | SC2 |  | SC3 |  | SC4 |  | SC5 |  | SC6 |
+     COMPONENTS  |_____|  |_____|  |_____|  |_____|  |_____|  |_____|
+                    |        |   _____|        |        |    ____|
+                    |        |  |              |        |   |
+     __________   __V________V__V______________V________V___V_______
+    | MCI | SI | | SubCh1 | SubCh9 |  ...  | SubCh3 | SubCh60 | ... |
+    |_____|____| |________|________|_______|________|_________|_____|
     Fast Information Ch.                 Main Service Channel
                       COMMON   INTERLEAVED   FRAME
 
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index f56a4ff..e157523 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -301,7 +301,6 @@ void DabMultiplexer::prepare_services_components()
                     }
                     break;
                 case subchannel_type_t::DataDmb:
-                case subchannel_type_t::Fidc:
                 case subchannel_type_t::Packet:
                     break;
                 default:
diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp
index 44e097c..809f09f 100644
--- a/src/MuxElements.cpp
+++ b/src/MuxElements.cpp
@@ -518,7 +518,6 @@ bool DabService::isProgramme(const std::shared_ptr<dabEnsemble>& ensemble) const
             ret = true;
             break;
         case subchannel_type_t::DataDmb:
-        case subchannel_type_t::Fidc:
         case subchannel_type_t::Packet:
             ret = false;
             break;
diff --git a/src/MuxElements.h b/src/MuxElements.h
index b2be73f..78055b4 100644
--- a/src/MuxElements.h
+++ b/src/MuxElements.h
@@ -61,7 +61,6 @@ enum class subchannel_type_t {
     DABAudio = 0,
     DABPlusAudio = 1,
     DataDmb = 2,
-    Fidc = 3,
     Packet = 4
 };
 
@@ -354,9 +353,6 @@ struct dabDataComponent {
 };
 
 
-struct dabFidcComponent {
-};
-
 
 struct dabPacketComponent {
     uint16_t id = 0;
@@ -385,7 +381,6 @@ class DabComponent : public RemoteControllable
 
         dabAudioComponent audio;
         dabDataComponent data;
-        dabFidcComponent fidc;
         dabPacketComponent packet;
 
         bool isPacketComponent(vec_sp_subchannel& subchannels) const;
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;
diff --git a/src/utils.cpp b/src/utils.cpp
index 5f81083..663872d 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -336,9 +336,6 @@ void printSubchannels(const vec_sp_subchannel& subchannels)
             case subchannel_type_t::DataDmb:
                 etiLog.log(info, " type:       data");
                 break;
-            case subchannel_type_t::Fidc:
-                etiLog.log(info, " type:       fidc");
-                break;
             case subchannel_type_t::Packet:
                 etiLog.log(info, " type:       packet");
                 break;