Merge KuntzeM's pull request fixing #35 into next

ETI with DAB (MUSICAM) and EEP_A protection level was not possible.

5 files changed, 35 insertions, 16 deletions

diff --git a/src/fig/FIG0_13.cpp b/src/fig/FIG0_13.cpp
index 0bb7fd7..433838e 100644
--- a/src/fig/FIG0_13.cpp
+++ b/src/fig/FIG0_13.cpp
@@ -90,7 +90,7 @@ FillStatus FIG0_13::fill(uint8_t *buf, size_t max_size)
         }
 
         if (    m_transmit_programme &&
-                (*subchannel)->type == subchannel_type_t::Audio &&
+                ((*subchannel)->type == subchannel_type_t::DABPlusAudio || (*subchannel)->type == subchannel_type_t::DABAudio) &&
                 (*componentFIG0_13)->audio.uaType != 0xffff) {
 
             const int required_size = 3+4+11;
diff --git a/src/fig/FIG0_2.cpp b/src/fig/FIG0_2.cpp
index e587c2b..5275a22 100644
--- a/src/fig/FIG0_2.cpp
+++ b/src/fig/FIG0_2.cpp
@@ -161,7 +161,8 @@ FillStatus FIG0_2::fill(uint8_t *buf, size_t max_size)
         etiLog.log(FIG0_2_TRACE, "FIG0_2::fill  loop SId=%04x %s/%s",
                 (*serviceFIG0_2)->id,
                 m_inserting_audio_not_data ? "AUDIO" : "DATA",
-                type == subchannel_type_t::Audio ? "Audio" :
+                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" : "?");
@@ -202,7 +203,7 @@ FillStatus FIG0_2::fill(uint8_t *buf, size_t max_size)
             break;
         }
 
-        if (type == subchannel_type_t::Audio) {
+        if (type == subchannel_type_t::DABPlusAudio || type == subchannel_type_t::DABAudio) {
             auto fig0_2serviceAudio = (FIGtype0_2_Service*)buf;
 
             fig0_2serviceAudio->SId = htons((*serviceFIG0_2)->id);
@@ -257,7 +258,17 @@ FillStatus FIG0_2::fill(uint8_t *buf, size_t max_size)
             }
 
             switch ((*subchannel)->type) {
-                case subchannel_type_t::Audio:
+                case (subchannel_type_t::DABAudio):
+                    {
+                        auto audio_description = (FIGtype0_2_audio_component*)buf;
+                        audio_description->TMid    = 0;
+                        audio_description->ASCTy   = (*component)->type;
+                        audio_description->SubChId = (*subchannel)->id;
+                        audio_description->PS      = ((curCpnt == 0) ? 1 : 0);
+                        audio_description->CA_flag = 0;
+                    }
+                    break;
+                case (subchannel_type_t::DABPlusAudio):
                     {
                         auto audio_description = (FIGtype0_2_audio_component*)buf;
                         audio_description->TMid    = 0;
diff --git a/src/fig/FIG0_24.cpp b/src/fig/FIG0_24.cpp
index 1441df2..960d261 100644
--- a/src/fig/FIG0_24.cpp
+++ b/src/fig/FIG0_24.cpp
@@ -93,7 +93,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size)
             }
         }
 
-        subchannel_type_t type = subchannel_type_t::Audio;
+        subchannel_type_t type = subchannel_type_t::DABAudio;
         bool isProgramme = true;
         bool oe = true;
 
@@ -107,7 +107,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size)
                 oe,
                 serviceFIG0_24->service_id,
                 m_inserting_audio_not_data ? "AUDIO" : "DATA",
-                type == subchannel_type_t::Audio ? "Audio" :
+                type == subchannel_type_t::DABAudio ? "Audio" :
                 type == subchannel_type_t::Packet ? "Packet" :
                 type == subchannel_type_t::DataDmb ? "DataDmb" :
                 type == subchannel_type_t::Fidc ? "Fidc" : "?");
@@ -147,7 +147,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size)
             break;
         }
 
-        if (type == subchannel_type_t::Audio) {
+        if (type == subchannel_type_t::DABAudio) {
             auto fig0_2serviceAudio = (FIGtype0_24_audioservice*)buf;
 
             fig0_2serviceAudio->SId = htons(serviceFIG0_24->service_id);
diff --git a/src/fig/FIG1.cpp b/src/fig/FIG1.cpp
index 7171a87..d0b6a17 100644
--- a/src/fig/FIG1.cpp
+++ b/src/fig/FIG1.cpp
@@ -94,10 +94,11 @@ FillStatus FIG1_1::fill(uint8_t *buf, size_t max_size)
             break;
         }
 
-        if ((*service)->getType(ensemble) == subchannel_type_t::Audio and
-                (*service)->label.has_fig1_label()) {
+        const auto type = (*service)->getType(ensemble);
 
-            auto fig1_1 = (FIGtype1_1*)buf;
+        if ( (type == subchannel_type_t::DABPlusAudio or type == subchannel_type_t::DABAudio) and
+                (*service)->label.has_fig1_label()) {
+            auto fig1_1 = (FIGtype1_1 *)buf;
 
             fig1_1->FIGtypeNumber = 1;
             fig1_1->Length = 21;
@@ -154,8 +155,11 @@ FillStatus FIG1_4::fill(uint8_t *buf, size_t max_size)
         /* We check in the config parser if the primary component has
          * a label, which is forbidden since V2.1.1 */
 
-        if ((*component)->label.has_fig1_label() ) {
-            if ((*service)->getType(ensemble) == subchannel_type_t::Audio) {
+        const auto type = (*service)->getType(ensemble);
+
+        if (not (*component)->label.long_label().empty() ) {
+            if (type == subchannel_type_t::DABAudio or type == subchannel_type_t::DABPlusAudio) {
+
                 if (remaining < 5 + 16 + 2) {
                     break;
                 }
@@ -241,8 +245,10 @@ FillStatus FIG1_5::fill(uint8_t *buf, size_t max_size)
             break;
         }
 
-        if ((*service)->getType(ensemble) != subchannel_type_t::Audio and
-                (*service)->label.has_fig1_label()) {
+        const auto type = (*service)->getType(ensemble);
+        const bool is_audio = (type == subchannel_type_t::DABAudio or type == subchannel_type_t::DABPlusAudio);
+
+        if (not is_audio) {
             auto fig1_5 = (FIGtype1_5 *)buf;
             fig1_5->FIGtypeNumber = 1;
             fig1_5->Length = 23;
diff --git a/src/fig/FIG2.cpp b/src/fig/FIG2.cpp
index fefde6e..afa64eb 100644
--- a/src/fig/FIG2.cpp
+++ b/src/fig/FIG2.cpp
@@ -202,7 +202,8 @@ FillStatus FIG2_1_and_5::fill(uint8_t *buf, size_t max_size)
 
     // Rotate through the subchannels until there is no more space
     while (service != ensemble->services.end()) {
-        const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::Audio;
+        const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::DABAudio or
+                ((*service)->getType(ensemble) == subchannel_type_t::DABPlusAudio);
 
         if (not (m_programme xor is_programme) and (*service)->label.has_fig2_label()) {
 
@@ -315,7 +316,8 @@ FillStatus FIG2_4::fill(uint8_t *buf, size_t max_size)
                 }
             }
 
-            const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::Audio;
+            const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::DABAudio or
+                    ((*service)->getType(ensemble) == subchannel_type_t::DABPlusAudio);
 
             const size_t id_length = is_programme ?
                 sizeof(FIGtype2_4_Programme_Identifier) :