Whitespace

1 files changed, 882 insertions, 882 deletions

diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index ea5a582..5defce7 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -642,294 +642,358 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
         index += fig_carousel.write_fibs(&etiFrame[index], currentFrame % 4, fib3_present);
     }
     else {
-    unsigned char figSize = 0;
+        unsigned char figSize = 0;
         // FIB 0 Insertion
         switch (insertFIG) {
 
-        case 0:
-        case 4:
-        case 8:
-        case 12:
-            // FIG type 0/0, Multiplex Configuration Info (MCI),
-            //  Ensemble information
-            fig0_0 = (FIGtype0_0 *) & etiFrame[index];
-
-            fig0_0->FIGtypeNumber = 0;
-            fig0_0->Length = 5;
-            fig0_0->CN = 0;
-            fig0_0->OE = 0;
-            fig0_0->PD = 0;
-            fig0_0->Extension = 0;
-
-            fig0_0->EId = htons(ensemble->id);
-            fig0_0->Change = 0;
-            fig0_0->Al = 0;
-            fig0_0->CIFcnt_hight = (currentFrame / 250) % 20;
-            fig0_0->CIFcnt_low = (currentFrame % 250);
-            index = index + 6;
-            figSize += 6;
-
-            break;
-
-        case 1:
-        case 6:
-        case 10:
-        case 13:
-            // FIG type 0/1, MIC, Sub-Channel Organization,
-            // one instance of the part for each subchannel
-            figtype0_1 = (FIGtype0_1 *) & etiFrame[index];
-
-            figtype0_1->FIGtypeNumber = 0;
-            figtype0_1->Length = 1;
-            figtype0_1->CN = 0;
-            figtype0_1->OE = 0;
-            figtype0_1->PD = 0;
-            figtype0_1->Extension = 1;
-            index = index + 2;
-            figSize += 2;
+            case 0:
+            case 4:
+            case 8:
+            case 12:
+                // FIG type 0/0, Multiplex Configuration Info (MCI),
+                //  Ensemble information
+                fig0_0 = (FIGtype0_0 *) & etiFrame[index];
+
+                fig0_0->FIGtypeNumber = 0;
+                fig0_0->Length = 5;
+                fig0_0->CN = 0;
+                fig0_0->OE = 0;
+                fig0_0->PD = 0;
+                fig0_0->Extension = 0;
+
+                fig0_0->EId = htons(ensemble->id);
+                fig0_0->Change = 0;
+                fig0_0->Al = 0;
+                fig0_0->CIFcnt_hight = (currentFrame / 250) % 20;
+                fig0_0->CIFcnt_low = (currentFrame % 250);
+                index = index + 6;
+                figSize += 6;
 
-            // Rotate through the subchannels until there is no more
-            // space in the FIG0/1
-            if (subchannelFIG0_1 == ensemble->subchannels.end()) {
-                subchannelFIG0_1 = ensemble->subchannels.begin();
-            }
-
-            for (; subchannelFIG0_1 != ensemble->subchannels.end();
-                    ++subchannelFIG0_1) {
-                dabProtection* protection = &(*subchannelFIG0_1)->protection;
+                break;
 
-                if ( (protection->form == UEP && figSize > 27) ||
-                        (protection->form == EEP && figSize > 26) ) {
-                    break;
+            case 1:
+            case 6:
+            case 10:
+            case 13:
+                // FIG type 0/1, MIC, Sub-Channel Organization,
+                // one instance of the part for each subchannel
+                figtype0_1 = (FIGtype0_1 *) & etiFrame[index];
+
+                figtype0_1->FIGtypeNumber = 0;
+                figtype0_1->Length = 1;
+                figtype0_1->CN = 0;
+                figtype0_1->OE = 0;
+                figtype0_1->PD = 0;
+                figtype0_1->Extension = 1;
+                index = index + 2;
+                figSize += 2;
+
+                // Rotate through the subchannels until there is no more
+                // space in the FIG0/1
+                if (subchannelFIG0_1 == ensemble->subchannels.end()) {
+                    subchannelFIG0_1 = ensemble->subchannels.begin();
                 }
 
-                if (protection->form == UEP) {
-                    fig0_1subchShort =
-                        (FIG_01_SubChannel_ShortF*) &etiFrame[index];
-                    fig0_1subchShort->SubChId = (*subchannelFIG0_1)->id;
+                for (; subchannelFIG0_1 != ensemble->subchannels.end();
+                        ++subchannelFIG0_1) {
+                    dabProtection* protection = &(*subchannelFIG0_1)->protection;
 
-                    fig0_1subchShort->StartAdress_high =
-                        (*subchannelFIG0_1)->startAddress / 256;
-                    fig0_1subchShort->StartAdress_low =
-                        (*subchannelFIG0_1)->startAddress % 256;
+                    if ( (protection->form == UEP && figSize > 27) ||
+                            (protection->form == EEP && figSize > 26) ) {
+                        break;
+                    }
 
-                    fig0_1subchShort->Short_Long_form = 0;
-                    fig0_1subchShort->TableSwitch = 0;
-                    fig0_1subchShort->TableIndex =
-                        protection->uep.tableIndex;
+                    if (protection->form == UEP) {
+                        fig0_1subchShort =
+                            (FIG_01_SubChannel_ShortF*) &etiFrame[index];
+                        fig0_1subchShort->SubChId = (*subchannelFIG0_1)->id;
 
-                    index = index + 3;
-                    figSize += 3;
-                    figtype0_1->Length += 3;
-                }
-                else if (protection->form == EEP) {
-                    fig0_1subchLong1 =
-                        (FIG_01_SubChannel_LongF*) &etiFrame[index];
-                    fig0_1subchLong1->SubChId = (*subchannelFIG0_1)->id;
-
-                    fig0_1subchLong1->StartAdress_high =
-                        (*subchannelFIG0_1)->startAddress / 256;
-                    fig0_1subchLong1->StartAdress_low =
-                        (*subchannelFIG0_1)->startAddress % 256;
-
-                    fig0_1subchLong1->Short_Long_form = 1;
-                    fig0_1subchLong1->Option = protection->eep.GetOption();
-                    fig0_1subchLong1->ProtectionLevel =
-                        protection->level;
-
-                    fig0_1subchLong1->Sub_ChannelSize_high =
-                        getSizeCu(*subchannelFIG0_1) / 256;
-                    fig0_1subchLong1->Sub_ChannelSize_low =
-                        getSizeCu(*subchannelFIG0_1) % 256;
-
-                    index = index + 4;
-                    figSize += 4;
-                    figtype0_1->Length += 4;
-                }
-            }
-            break;
+                        fig0_1subchShort->StartAdress_high =
+                            (*subchannelFIG0_1)->startAddress / 256;
+                        fig0_1subchShort->StartAdress_low =
+                            (*subchannelFIG0_1)->startAddress % 256;
 
-        case 2:
-        case 9:
-        case 11:
-        case 14:
-            // FIG type 0/2, MCI, Service Organization, one instance of
-            // FIGtype0_2_Service for each subchannel
-            fig0_2 = NULL;
-            cur = 0;
-
-            // Rotate through the subchannels until there is no more
-            // space in the FIG0/1
-            if (serviceProgFIG0_2 == ensemble->services.end()) {
-                serviceProgFIG0_2 = ensemble->services.begin();
-            }
+                        fig0_1subchShort->Short_Long_form = 0;
+                        fig0_1subchShort->TableSwitch = 0;
+                        fig0_1subchShort->TableIndex =
+                            protection->uep.tableIndex;
 
-            for (; serviceProgFIG0_2 != ensemble->services.end();
-                    ++serviceProgFIG0_2) {
-                if (!(*serviceProgFIG0_2)->nbComponent(ensemble->components)) {
-                    continue;
+                        index = index + 3;
+                        figSize += 3;
+                        figtype0_1->Length += 3;
+                    }
+                    else if (protection->form == EEP) {
+                        fig0_1subchLong1 =
+                            (FIG_01_SubChannel_LongF*) &etiFrame[index];
+                        fig0_1subchLong1->SubChId = (*subchannelFIG0_1)->id;
+
+                        fig0_1subchLong1->StartAdress_high =
+                            (*subchannelFIG0_1)->startAddress / 256;
+                        fig0_1subchLong1->StartAdress_low =
+                            (*subchannelFIG0_1)->startAddress % 256;
+
+                        fig0_1subchLong1->Short_Long_form = 1;
+                        fig0_1subchLong1->Option = protection->eep.GetOption();
+                        fig0_1subchLong1->ProtectionLevel =
+                            protection->level;
+
+                        fig0_1subchLong1->Sub_ChannelSize_high =
+                            getSizeCu(*subchannelFIG0_1) / 256;
+                        fig0_1subchLong1->Sub_ChannelSize_low =
+                            getSizeCu(*subchannelFIG0_1) % 256;
+
+                        index = index + 4;
+                        figSize += 4;
+                        figtype0_1->Length += 4;
+                    }
                 }
+                break;
 
-                if ((*serviceProgFIG0_2)->getType(ensemble) != subchannel_type_t::Audio) {
-                    continue;
+            case 2:
+            case 9:
+            case 11:
+            case 14:
+                // FIG type 0/2, MCI, Service Organization, one instance of
+                // FIGtype0_2_Service for each subchannel
+                fig0_2 = NULL;
+                cur = 0;
+
+                // Rotate through the subchannels until there is no more
+                // space in the FIG0/1
+                if (serviceProgFIG0_2 == ensemble->services.end()) {
+                    serviceProgFIG0_2 = ensemble->services.begin();
                 }
 
-                ++cur;
+                for (; serviceProgFIG0_2 != ensemble->services.end();
+                        ++serviceProgFIG0_2) {
+                    if (!(*serviceProgFIG0_2)->nbComponent(ensemble->components)) {
+                        continue;
+                    }
 
-                if (fig0_2 == NULL) {
-                    fig0_2 = (FIGtype0_2 *) & etiFrame[index];
+                    if ((*serviceProgFIG0_2)->getType(ensemble) != subchannel_type_t::Audio) {
+                        continue;
+                    }
 
-                    fig0_2->FIGtypeNumber = 0;
-                    fig0_2->Length = 1;
-                    fig0_2->CN = 0;
-                    fig0_2->OE = 0;
-                    fig0_2->PD = 0;
-                    fig0_2->Extension = 2;
-                    index = index + 2;
-                    figSize += 2;
-                }
+                    ++cur;
 
-                if (figSize + 3
-                        + (*serviceProgFIG0_2)->nbComponent(ensemble->components)
-                        * 2 > 30) {
-                    break;
-                }
+                    if (fig0_2 == NULL) {
+                        fig0_2 = (FIGtype0_2 *) & etiFrame[index];
 
-                fig0_2serviceAudio = (FIGtype0_2_Service*) &etiFrame[index];
+                        fig0_2->FIGtypeNumber = 0;
+                        fig0_2->Length = 1;
+                        fig0_2->CN = 0;
+                        fig0_2->OE = 0;
+                        fig0_2->PD = 0;
+                        fig0_2->Extension = 2;
+                        index = index + 2;
+                        figSize += 2;
+                    }
 
-                fig0_2serviceAudio->SId = htons((*serviceProgFIG0_2)->id);
-                fig0_2serviceAudio->Local_flag = 0;
-                fig0_2serviceAudio->CAId = 0;
-                fig0_2serviceAudio->NbServiceComp =
-                    (*serviceProgFIG0_2)->nbComponent(ensemble->components);
-                index += 3;
-                fig0_2->Length += 3;
-                figSize += 3;
+                    if (figSize + 3
+                            + (*serviceProgFIG0_2)->nbComponent(ensemble->components)
+                            * 2 > 30) {
+                        break;
+                    }
 
-                int curCpnt = 0;
-                for (component = getComponent(ensemble->components,
-                            (*serviceProgFIG0_2)->id);
-                        component != ensemble->components.end();
-                        component = getComponent(ensemble->components,
-                            (*serviceProgFIG0_2)->id, component)) {
-                    subchannel = getSubchannel(ensemble->subchannels,
-                            (*component)->subchId);
+                    fig0_2serviceAudio = (FIGtype0_2_Service*) &etiFrame[index];
 
-                    if (subchannel == ensemble->subchannels.end()) {
-                        etiLog.log(error,
-                                "Subchannel %i does not exist for component "
-                                "of service %i\n",
-                                (*component)->subchId, (*component)->serviceId);
-                        throw MuxInitException();
-                    }
+                    fig0_2serviceAudio->SId = htons((*serviceProgFIG0_2)->id);
+                    fig0_2serviceAudio->Local_flag = 0;
+                    fig0_2serviceAudio->CAId = 0;
+                    fig0_2serviceAudio->NbServiceComp =
+                        (*serviceProgFIG0_2)->nbComponent(ensemble->components);
+                    index += 3;
+                    fig0_2->Length += 3;
+                    figSize += 3;
 
-                    switch ((*subchannel)->type) {
-                        case subchannel_type_t::Audio:
-                            audio_description =
-                                (FIGtype0_2_audio_component*)&etiFrame[index];
-                            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::DataDmb:
-                            data_description =
-                                (FIGtype0_2_data_component*)&etiFrame[index];
-                            data_description->TMid    = 1;
-                            data_description->DSCTy   = (*component)->type;
-                            data_description->SubChId = (*subchannel)->id;
-                            data_description->PS      = ((curCpnt == 0) ? 1 : 0);
-                            data_description->CA_flag = 0;
-                            break;
-                        case subchannel_type_t::Packet:
-                            packet_description =
-                                (FIGtype0_2_packet_component*)&etiFrame[index];
-                            packet_description->TMid    = 3;
-                            packet_description->setSCId((*component)->packet.id);
-                            packet_description->PS      = ((curCpnt == 0) ? 1 : 0);
-                            packet_description->CA_flag = 0;
-                            break;
-                        default:
+                    int curCpnt = 0;
+                    for (component = getComponent(ensemble->components,
+                                (*serviceProgFIG0_2)->id);
+                            component != ensemble->components.end();
+                            component = getComponent(ensemble->components,
+                                (*serviceProgFIG0_2)->id, component)) {
+                        subchannel = getSubchannel(ensemble->subchannels,
+                                (*component)->subchId);
+
+                        if (subchannel == ensemble->subchannels.end()) {
                             etiLog.log(error,
-                                    "Component type not supported\n");
+                                    "Subchannel %i does not exist for component "
+                                    "of service %i\n",
+                                    (*component)->subchId, (*component)->serviceId);
                             throw MuxInitException();
+                        }
+
+                        switch ((*subchannel)->type) {
+                            case subchannel_type_t::Audio:
+                                audio_description =
+                                    (FIGtype0_2_audio_component*)&etiFrame[index];
+                                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::DataDmb:
+                                data_description =
+                                    (FIGtype0_2_data_component*)&etiFrame[index];
+                                data_description->TMid    = 1;
+                                data_description->DSCTy   = (*component)->type;
+                                data_description->SubChId = (*subchannel)->id;
+                                data_description->PS      = ((curCpnt == 0) ? 1 : 0);
+                                data_description->CA_flag = 0;
+                                break;
+                            case subchannel_type_t::Packet:
+                                packet_description =
+                                    (FIGtype0_2_packet_component*)&etiFrame[index];
+                                packet_description->TMid    = 3;
+                                packet_description->setSCId((*component)->packet.id);
+                                packet_description->PS      = ((curCpnt == 0) ? 1 : 0);
+                                packet_description->CA_flag = 0;
+                                break;
+                            default:
+                                etiLog.log(error,
+                                        "Component type not supported\n");
+                                throw MuxInitException();
+                        }
+                        index += 2;
+                        fig0_2->Length += 2;
+                        figSize += 2;
+                        if (figSize > 30) {
+                            etiLog.log(error,
+                                    "Sorry, no space left in FIG 0/2 to insert "
+                                    "component %i of program service %i.\n",
+                                    curCpnt, cur);
+                            throw MuxInitException();
+                        }
+                        ++curCpnt;
                     }
-                    index += 2;
-                    fig0_2->Length += 2;
-                    figSize += 2;
-                    if (figSize > 30) {
-                        etiLog.log(error,
-                                "Sorry, no space left in FIG 0/2 to insert "
-                                "component %i of program service %i.\n",
-                                curCpnt, cur);
-                        throw MuxInitException();
-                    }
-                    ++curCpnt;
                 }
-            }
-            break;
+                break;
 
-        case 3:
-            fig0_2 = NULL;
-            cur = 0;
+            case 3:
+                fig0_2 = NULL;
+                cur = 0;
 
-            if (serviceDataFIG0_2 == ensemble->services.end()) {
-                serviceDataFIG0_2 = ensemble->services.begin();
-            }
-            for (; serviceDataFIG0_2 != ensemble->services.end();
-                    ++serviceDataFIG0_2) {
-                if (!(*serviceDataFIG0_2)->nbComponent(ensemble->components)) {
-                    continue;
+                if (serviceDataFIG0_2 == ensemble->services.end()) {
+                    serviceDataFIG0_2 = ensemble->services.begin();
                 }
+                for (; serviceDataFIG0_2 != ensemble->services.end();
+                        ++serviceDataFIG0_2) {
+                    if (!(*serviceDataFIG0_2)->nbComponent(ensemble->components)) {
+                        continue;
+                    }
 
-                auto type = (*serviceDataFIG0_2)->getType(ensemble);
-                if (    type == subchannel_type_t::Audio ||
-                        type == subchannel_type_t::Fidc  ) {
-                    continue;
-                }
+                    auto type = (*serviceDataFIG0_2)->getType(ensemble);
+                    if (    type == subchannel_type_t::Audio ||
+                            type == subchannel_type_t::Fidc  ) {
+                        continue;
+                    }
 
-                ++cur;
+                    ++cur;
 
-                if (fig0_2 == NULL) {
-                    fig0_2 = (FIGtype0_2 *) & etiFrame[index];
+                    if (fig0_2 == NULL) {
+                        fig0_2 = (FIGtype0_2 *) & etiFrame[index];
 
-                    fig0_2->FIGtypeNumber = 0;
-                    fig0_2->Length = 1;
-                    fig0_2->CN = 0;
-                    fig0_2->OE = 0;
-                    fig0_2->PD = 1;
-                    fig0_2->Extension = 2;
-                    index = index + 2;
-                    figSize += 2;
-                }
+                        fig0_2->FIGtypeNumber = 0;
+                        fig0_2->Length = 1;
+                        fig0_2->CN = 0;
+                        fig0_2->OE = 0;
+                        fig0_2->PD = 1;
+                        fig0_2->Extension = 2;
+                        index = index + 2;
+                        figSize += 2;
+                    }
 
-                if (figSize + 5
-                        + (*serviceDataFIG0_2)->nbComponent(ensemble->components)
-                        * 2 > 30) {
-                    break;
-                }
+                    if (figSize + 5
+                            + (*serviceDataFIG0_2)->nbComponent(ensemble->components)
+                            * 2 > 30) {
+                        break;
+                    }
 
-                fig0_2serviceData =
-                    (FIGtype0_2_Service_data*) &etiFrame[index];
+                    fig0_2serviceData =
+                        (FIGtype0_2_Service_data*) &etiFrame[index];
 
-                fig0_2serviceData->SId = htonl((*serviceDataFIG0_2)->id);
-                fig0_2serviceData->Local_flag = 0;
-                fig0_2serviceData->CAId = 0;
-                fig0_2serviceData->NbServiceComp =
-                    (*serviceDataFIG0_2)->nbComponent(ensemble->components);
-                fig0_2->Length += 5;
-                index += 5;
-                figSize += 5;
+                    fig0_2serviceData->SId = htonl((*serviceDataFIG0_2)->id);
+                    fig0_2serviceData->Local_flag = 0;
+                    fig0_2serviceData->CAId = 0;
+                    fig0_2serviceData->NbServiceComp =
+                        (*serviceDataFIG0_2)->nbComponent(ensemble->components);
+                    fig0_2->Length += 5;
+                    index += 5;
+                    figSize += 5;
+
+                    int curCpnt = 0;
+                    for (component = getComponent(ensemble->components,
+                                (*serviceDataFIG0_2)->id);
+                            component != ensemble->components.end();
+                            component = getComponent(ensemble->components,
+                                (*serviceDataFIG0_2)->id, component)) {
+                        subchannel = getSubchannel(ensemble->subchannels,
+                                (*component)->subchId);
+                        if (subchannel == ensemble->subchannels.end()) {
+                            etiLog.log(error,
+                                    "Subchannel %i does not exist for component "
+                                    "of service %i\n",
+                                    (*component)->subchId, (*component)->serviceId);
+                            throw MuxInitException();
+                        }
+
+                        switch ((*subchannel)->type) {
+                            case subchannel_type_t::Audio:
+                                audio_description =
+                                    (FIGtype0_2_audio_component*)&etiFrame[index];
+                                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::DataDmb:
+                                data_description =
+                                    (FIGtype0_2_data_component*)&etiFrame[index];
+                                data_description->TMid = 1;
+                                data_description->DSCTy = (*component)->type;
+                                data_description->SubChId = (*subchannel)->id;
+                                data_description->PS = ((curCpnt == 0) ? 1 : 0);
+                                data_description->CA_flag = 0;
+                                break;
+                            case subchannel_type_t::Packet:
+                                packet_description =
+                                    (FIGtype0_2_packet_component*)&etiFrame[index];
+                                packet_description->TMid = 3;
+                                packet_description->setSCId((*component)->packet.id);
+                                packet_description->PS = ((curCpnt == 0) ? 1 : 0);
+                                packet_description->CA_flag = 0;
+                                break;
+                            default:
+                                etiLog.log(error,
+                                        "Component type not supported\n");
+                                throw MuxInitException();
+                        }
+                        index += 2;
+                        fig0_2->Length += 2;
+                        figSize += 2;
+                        if (figSize > 30) {
+                            etiLog.log(error,
+                                    "Sorry, no place left in FIG 0/2 to insert "
+                                    "component %i of data service %i.\n",
+                                    curCpnt, cur);
+                            throw MuxInitException();
+                        }
+                        ++curCpnt;
+                    }
+                }
+                break;
+
+            case 5:
+                fig0_3_header = NULL;
 
-                int curCpnt = 0;
-                for (component = getComponent(ensemble->components,
-                            (*serviceDataFIG0_2)->id);
+                for (component = ensemble->components.begin();
                         component != ensemble->components.end();
-                        component = getComponent(ensemble->components,
-                            (*serviceDataFIG0_2)->id, component)) {
+                        ++component) {
                     subchannel = getSubchannel(ensemble->subchannels,
                             (*component)->subchId);
+
                     if (subchannel == ensemble->subchannels.end()) {
                         etiLog.log(error,
                                 "Subchannel %i does not exist for component "
@@ -938,436 +1002,164 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
                         throw MuxInitException();
                     }
 
-                    switch ((*subchannel)->type) {
-                        case subchannel_type_t::Audio:
-                            audio_description =
-                                (FIGtype0_2_audio_component*)&etiFrame[index];
-                            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::DataDmb:
-                            data_description =
-                                (FIGtype0_2_data_component*)&etiFrame[index];
-                            data_description->TMid = 1;
-                            data_description->DSCTy = (*component)->type;
-                            data_description->SubChId = (*subchannel)->id;
-                            data_description->PS = ((curCpnt == 0) ? 1 : 0);
-                            data_description->CA_flag = 0;
-                            break;
-                        case subchannel_type_t::Packet:
-                            packet_description =
-                                (FIGtype0_2_packet_component*)&etiFrame[index];
-                            packet_description->TMid = 3;
-                            packet_description->setSCId((*component)->packet.id);
-                            packet_description->PS = ((curCpnt == 0) ? 1 : 0);
-                            packet_description->CA_flag = 0;
-                            break;
-                        default:
-                            etiLog.log(error,
-                                    "Component type not supported\n");
-                            throw MuxInitException();
-                    }
-                    index += 2;
-                    fig0_2->Length += 2;
-                    figSize += 2;
-                    if (figSize > 30) {
-                        etiLog.log(error,
-                                "Sorry, no place left in FIG 0/2 to insert "
-                                "component %i of data service %i.\n",
-                                curCpnt, cur);
-                        throw MuxInitException();
-                    }
-                    ++curCpnt;
-                }
-            }
-            break;
-
-        case 5:
-            fig0_3_header = NULL;
-
-            for (component = ensemble->components.begin();
-                    component != ensemble->components.end();
-                    ++component) {
-                subchannel = getSubchannel(ensemble->subchannels,
-                        (*component)->subchId);
-
-                if (subchannel == ensemble->subchannels.end()) {
-                    etiLog.log(error,
-                            "Subchannel %i does not exist for component "
-                            "of service %i\n",
-                            (*component)->subchId, (*component)->serviceId);
-                    throw MuxInitException();
-                }
-
-                if ((*subchannel)->type != subchannel_type_t::Packet)
-                    continue;
+                    if ((*subchannel)->type != subchannel_type_t::Packet)
+                        continue;
 
-                if (fig0_3_header == NULL) {
-                    fig0_3_header = (FIGtype0_3_header*)&etiFrame[index];
-                    fig0_3_header->FIGtypeNumber = 0;
-                    fig0_3_header->Length = 1;
-                    fig0_3_header->CN = 0;
-                    fig0_3_header->OE = 0;
-                    fig0_3_header->PD = 0;
-                    fig0_3_header->Extension = 3;
+                    if (fig0_3_header == NULL) {
+                        fig0_3_header = (FIGtype0_3_header*)&etiFrame[index];
+                        fig0_3_header->FIGtypeNumber = 0;
+                        fig0_3_header->Length = 1;
+                        fig0_3_header->CN = 0;
+                        fig0_3_header->OE = 0;
+                        fig0_3_header->PD = 0;
+                        fig0_3_header->Extension = 3;
 
-                    index += 2;
-                    figSize += 2;
-                }
-
-                bool factumAnalyzer = m_pt.get("general.writescca", false);
-
-                /*  Warning: When bit SCCA_flag is unset(0), the multiplexer
-                 *  R&S does not send the SCCA field. But, in the Factum ETI
-                 *  analyzer, if this field is not there, it is an error.
-                 */
-                fig0_3_data = (FIGtype0_3_data*)&etiFrame[index];
-                fig0_3_data->setSCId((*component)->packet.id);
-                fig0_3_data->rfa = 0;
-                fig0_3_data->SCCA_flag = 0;
-                // if 0, datagroups are used
-                fig0_3_data->DG_flag = !(*component)->packet.datagroup;
-                fig0_3_data->rfu = 0;
-                fig0_3_data->DSCTy = (*component)->type;
-                fig0_3_data->SubChId = (*subchannel)->id;
-                fig0_3_data->setPacketAddress((*component)->packet.address);
-                if (factumAnalyzer) {
-                    fig0_3_data->SCCA = 0;
-                }
-
-                fig0_3_header->Length += 5;
-                index += 5;
-                figSize += 5;
-                if (factumAnalyzer) {
-                    fig0_3_header->Length += 2;
-                    index += 2;
-                    figSize += 2;
-                }
-
-                if (figSize > 30) {
-                    etiLog.log(error,
-                            "can't add to Fic Fig 0/3, "
-                            "too much packet service\n");
-                    throw MuxInitException();
-                }
-            }
-            break;
-
-        case 7:
-            fig0 = NULL;
-            if (serviceFIG0_17 == ensemble->services.end()) {
-                serviceFIG0_17 = ensemble->services.begin();
-            }
-            for (; serviceFIG0_17 != ensemble->services.end();
-                    ++serviceFIG0_17) {
-
-                if (    (*serviceFIG0_17)->pty == 0 &&
-                        (*serviceFIG0_17)->language == 0) {
-                    continue;
-                }
-
-                if (fig0 == NULL) {
-                    fig0 = (FIGtype0*)&etiFrame[index];
-                    fig0->FIGtypeNumber = 0;
-                    fig0->Length = 1;
-                    fig0->CN = 0;
-                    fig0->OE = 0;
-                    fig0->PD = 0;
-                    fig0->Extension = 17;
-                    index += 2;
-                    figSize += 2;
-                }
-
-                if ((*serviceFIG0_17)->language == 0) {
-                    if (figSize + 4 > 30) {
-                        break;
+                        index += 2;
+                        figSize += 2;
                     }
-                }
-                else {
-                    if (figSize + 5 > 30) {
-                        break;
+
+                    bool factumAnalyzer = m_pt.get("general.writescca", false);
+
+                    /*  Warning: When bit SCCA_flag is unset(0), the multiplexer
+                     *  R&S does not send the SCCA field. But, in the Factum ETI
+                     *  analyzer, if this field is not there, it is an error.
+                     */
+                    fig0_3_data = (FIGtype0_3_data*)&etiFrame[index];
+                    fig0_3_data->setSCId((*component)->packet.id);
+                    fig0_3_data->rfa = 0;
+                    fig0_3_data->SCCA_flag = 0;
+                    // if 0, datagroups are used
+                    fig0_3_data->DG_flag = !(*component)->packet.datagroup;
+                    fig0_3_data->rfu = 0;
+                    fig0_3_data->DSCTy = (*component)->type;
+                    fig0_3_data->SubChId = (*subchannel)->id;
+                    fig0_3_data->setPacketAddress((*component)->packet.address);
+                    if (factumAnalyzer) {
+                        fig0_3_data->SCCA = 0;
                     }
-                }
 
-                programme =
-                    (FIGtype0_17_programme*)&etiFrame[index];
-                programme->SId = htons((*serviceFIG0_17)->id);
-                programme->SD = 1;
-                programme->PS = 0;
-                programme->L = (*serviceFIG0_17)->language != 0;
-                programme->CC = 0;
-                programme->Rfa = 0;
-                programme->NFC = 0;
-                if ((*serviceFIG0_17)->language == 0) {
-                    etiFrame[index + 3] = (*serviceFIG0_17)->pty;
-                    fig0->Length += 4;
-                    index += 4;
-                    figSize += 4;
-                }
-                else {
-                    etiFrame[index + 3] = (*serviceFIG0_17)->language;
-                    etiFrame[index + 4] = (*serviceFIG0_17)->pty;
-                    fig0->Length += 5;
+                    fig0_3_header->Length += 5;
                     index += 5;
                     figSize += 5;
-                }
-            }
-            break;
-    }
-
-    if (figSize > 30) {
-        etiLog.log(error,
-                "FIB0 overload (%i > 30)\n", figSize);
-        throw MuxInitException();
-    }
-
-    memcpy(&etiFrame[index], Padding_FIB, 30 - figSize);
-    index += 30 - figSize;
-
-    CRCtmp = 0xffff;
-    CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
-    CRCtmp ^= 0xffff;
-    etiFrame[index++] = ((char *) &CRCtmp)[1];
-    etiFrame[index++] = ((char *) &CRCtmp)[0];
-
-    figSize = 0;
-    // FIB 1 insertion
-    switch (rotateFIB) {
-        case 0:     // FIG 0/8 program
-            fig0 = NULL;
+                    if (factumAnalyzer) {
+                        fig0_3_header->Length += 2;
+                        index += 2;
+                        figSize += 2;
+                    }
 
-            if (componentProgFIG0_8 == ensemble->components.end()) {
-                componentProgFIG0_8 = ensemble->components.begin();
-            }
-            for (; componentProgFIG0_8 != ensemble->components.end();
-                    ++componentProgFIG0_8) {
-                service = getService(*componentProgFIG0_8,
-                        ensemble->services);
-                subchannel = getSubchannel(ensemble->subchannels,
-                        (*componentProgFIG0_8)->subchId);
-                if (subchannel == ensemble->subchannels.end()) {
-                    etiLog.log(error,
-                            "Subchannel %i does not exist for component "
-                            "of service %i\n",
-                            (*componentProgFIG0_8)->subchId,
-                            (*componentProgFIG0_8)->serviceId);
-                    throw MuxInitException();
+                    if (figSize > 30) {
+                        etiLog.log(error,
+                                "can't add to Fic Fig 0/3, "
+                                "too much packet service\n");
+                        throw MuxInitException();
+                    }
                 }
+                break;
 
-                if (!(*service)->program)
-                    continue;
-
-                if (fig0 == NULL) {
-                    fig0 = (FIGtype0*)&etiFrame[index];
-                    fig0->FIGtypeNumber = 0;
-                    fig0->Length = 1;
-                    fig0->CN = 0;
-                    fig0->OE = 0;
-                    fig0->PD = 0;
-                    fig0->Extension = 8;
-                    index += 2;
-                    figSize += 2;
+            case 7:
+                fig0 = NULL;
+                if (serviceFIG0_17 == ensemble->services.end()) {
+                    serviceFIG0_17 = ensemble->services.begin();
                 }
+                for (; serviceFIG0_17 != ensemble->services.end();
+                        ++serviceFIG0_17) {
 
-                if ((*subchannel)->type == subchannel_type_t::Packet) {
-                    // Data packet
-
-                    if (figSize > 30 - 5) {
-                        break;
+                    if (    (*serviceFIG0_17)->pty == 0 &&
+                            (*serviceFIG0_17)->language == 0) {
+                        continue;
                     }
-                    etiFrame[index] =
-                        ((*componentProgFIG0_8)->serviceId >> 8) & 0xFF;
-                    etiFrame[index+1] =
-                        ((*componentProgFIG0_8)->serviceId) & 0xFF;
-                    fig0->Length += 2;
-                    index += 2;
-                    figSize += 2;
-
-                    FIGtype0_8_long* definition =
-                        (FIGtype0_8_long*)&etiFrame[index];
-                    memset(definition, 0, 3);
-                    definition->ext = 0;    // no rfa
-                    definition->SCIdS = (*componentProgFIG0_8)->SCIdS;
-                    definition->LS = 1;
-                    definition->setSCId((*componentProgFIG0_8)->packet.id);
-                    fig0->Length += 3;
-                    index += 3;             // 8 minus rfa
-                    figSize += 3;
-                }
-                else {    // Audio, data stream or FIDC
-                    if (figSize > 30 - 4) {
-                        break;
-                    }
-                    etiFrame[index] =
-                        ((*componentProgFIG0_8)->serviceId >> 8) & 0xFF;
-                    etiFrame[index+1] =
-                        ((*componentProgFIG0_8)->serviceId) & 0xFF;
-
-                    fig0->Length += 2;
-                    index += 2;
-                    figSize += 2;
-
-                    FIGtype0_8_short* definition =
-                        (FIGtype0_8_short*)&etiFrame[index];
-                    memset(definition, 0, 2);
-                    definition->ext = 0;    // no rfa
-                    definition->SCIdS = (*componentProgFIG0_8)->SCIdS;
-                    definition->LS = 0;
-                    definition->MscFic = 0;
-                    definition->Id = (*componentProgFIG0_8)->subchId;
-                    fig0->Length += 2;
-                    index += 2;             // 4 minus rfa
-                    figSize += 2;
-                }
-            }
-            break;
-
-        case 1:     // FIG 0/8 data
-            fig0 = NULL;
-
-            if (componentDataFIG0_8 == ensemble->components.end()) {
-                componentDataFIG0_8 = ensemble->components.begin();
-            }
-            for (; componentDataFIG0_8 != ensemble->components.end();
-                    ++componentDataFIG0_8) {
-                service = getService(*componentDataFIG0_8,
-                        ensemble->services);
-
-                subchannel = getSubchannel(ensemble->subchannels,
-                        (*componentDataFIG0_8)->subchId);
 
-                if (subchannel == ensemble->subchannels.end()) {
-                    etiLog.log(error,
-                            "Subchannel %i does not exist for component "
-                            "of service %i\n",
-                            (*componentDataFIG0_8)->subchId,
-                            (*componentDataFIG0_8)->serviceId);
-                    throw MuxInitException();
-                }
-
-                if ((*service)->program)
-                    continue;
-
-                if (fig0 == NULL) {
-                    fig0 = (FIGtype0*)&etiFrame[index];
-                    fig0->FIGtypeNumber = 0;
-                    fig0->Length = 1;
-                    fig0->CN = 0;
-                    fig0->OE = 0;
-                    fig0->PD = 1;
-                    fig0->Extension = 8;
-                    index += 2;
-                    figSize += 2;
-                }
+                    if (fig0 == NULL) {
+                        fig0 = (FIGtype0*)&etiFrame[index];
+                        fig0->FIGtypeNumber = 0;
+                        fig0->Length = 1;
+                        fig0->CN = 0;
+                        fig0->OE = 0;
+                        fig0->PD = 0;
+                        fig0->Extension = 17;
+                        index += 2;
+                        figSize += 2;
+                    }
 
-                if ((*subchannel)->type == subchannel_type_t::Packet) {
-                    // Data packet
+                    if ((*serviceFIG0_17)->language == 0) {
+                        if (figSize + 4 > 30) {
+                            break;
+                        }
+                    }
+                    else {
+                        if (figSize + 5 > 30) {
+                            break;
+                        }
+                    }
 
-                    if (figSize > 30 - 7) {
-                        break;
+                    programme =
+                        (FIGtype0_17_programme*)&etiFrame[index];
+                    programme->SId = htons((*serviceFIG0_17)->id);
+                    programme->SD = 1;
+                    programme->PS = 0;
+                    programme->L = (*serviceFIG0_17)->language != 0;
+                    programme->CC = 0;
+                    programme->Rfa = 0;
+                    programme->NFC = 0;
+                    if ((*serviceFIG0_17)->language == 0) {
+                        etiFrame[index + 3] = (*serviceFIG0_17)->pty;
+                        fig0->Length += 4;
+                        index += 4;
+                        figSize += 4;
                     }
-                    etiFrame[index] =
-                        ((*componentDataFIG0_8)->serviceId >> 8) & 0xFF;
-                    etiFrame[index+1] =
-                        ((*componentDataFIG0_8)->serviceId) & 0xFF;
-                    fig0->Length += 4;
-                    index += 4;
-                    figSize += 4;
-
-                    FIGtype0_8_long* definition =
-                        (FIGtype0_8_long*)&etiFrame[index];
-                    memset(definition, 0, 3);
-                    definition->ext = 0;    // no rfa
-                    definition->SCIdS = (*componentDataFIG0_8)->SCIdS;
-                    definition->LS = 1;
-                    definition->setSCId((*componentDataFIG0_8)->packet.id);
-                    fig0->Length += 3;
-                    index += 3;             // 8 minus rfa
-                    figSize += 3;
-                }
-                else {    // Audio, data stream or FIDC
-                    if (figSize > 30 - 6) {
-                        break;
+                    else {
+                        etiFrame[index + 3] = (*serviceFIG0_17)->language;
+                        etiFrame[index + 4] = (*serviceFIG0_17)->pty;
+                        fig0->Length += 5;
+                        index += 5;
+                        figSize += 5;
                     }
-                    etiFrame[index] =
-                        ((*componentDataFIG0_8)->serviceId >> 8) & 0xFF;
-                    etiFrame[index+1] =
-                        ((*componentDataFIG0_8)->serviceId) & 0xFF;
-                    fig0->Length += 4;
-                    index += 4;
-                    figSize += 4;
-
-                    FIGtype0_8_short* definition =
-                        (FIGtype0_8_short*)&etiFrame[index];
-                    memset(definition, 0, 2);
-                    definition->ext = 0;    // no rfa
-                    definition->SCIdS = (*componentDataFIG0_8)->SCIdS;
-                    definition->LS = 0;
-                    definition->MscFic = 0;
-                    definition->Id = (*componentDataFIG0_8)->subchId;
-                    fig0->Length += 2;
-                    index += 2;             // 4 minus rfa
-                    figSize += 2;
                 }
-            }
-            break;
-
-        case 3:
-            // FIG type 1/0, Service Information (SI), Ensemble Label
-            fig1_0 = (FIGtype1_0 *) & etiFrame[index];
-
-            fig1_0->Length = 21;
-            fig1_0->FIGtypeNumber = 1;
-            fig1_0->Extension = 0;
-            fig1_0->OE = 0;
-            fig1_0->Charset = 0;
-            fig1_0->EId = htons(ensemble->id);
-            index = index + 4;
-
-            ensemble->label.writeLabel(&etiFrame[index]);
-            index = index + 16;
-
-            etiFrame[index++] = ensemble->label.flag() >> 8;
-            etiFrame[index++] = ensemble->label.flag() & 0xFF;
-
-            figSize += 22;
-            break;
-
-        case 5:
-        case 6:
-            // FIG 0 / 13
-            fig0 = NULL;
+                break;
+        }
 
-            if (componentFIG0_13 == ensemble->components.end()) {
-                componentFIG0_13 = ensemble->components.begin();
+        if (figSize > 30) {
+            etiLog.log(error,
+                    "FIB0 overload (%i > 30)\n", figSize);
+            throw MuxInitException();
+        }
 
-                transmitFIG0_13programme = !transmitFIG0_13programme;
-                // Alternate between data and and programme FIG0/13,
-                // do not mix fig0 with PD=0 with extension 13 stuff
-                // that actually needs PD=1, and vice versa
-            }
+        memcpy(&etiFrame[index], Padding_FIB, 30 - figSize);
+        index += 30 - figSize;
 
-            for (; componentFIG0_13 != ensemble->components.end();
-                    ++componentFIG0_13) {
+        CRCtmp = 0xffff;
+        CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
+        CRCtmp ^= 0xffff;
+        etiFrame[index++] = ((char *) &CRCtmp)[1];
+        etiFrame[index++] = ((char *) &CRCtmp)[0];
 
-                subchannel = getSubchannel(ensemble->subchannels,
-                        (*componentFIG0_13)->subchId);
+        figSize = 0;
+        // FIB 1 insertion
+        switch (rotateFIB) {
+            case 0:     // FIG 0/8 program
+                fig0 = NULL;
 
-                if (subchannel == ensemble->subchannels.end()) {
-                    etiLog.log(error,
-                            "Subchannel %i does not exist for component "
-                            "of service %i\n",
-                            (*componentFIG0_13)->subchId,
-                            (*componentFIG0_13)->serviceId);
-                    throw MuxInitException();
+                if (componentProgFIG0_8 == ensemble->components.end()) {
+                    componentProgFIG0_8 = ensemble->components.begin();
                 }
+                for (; componentProgFIG0_8 != ensemble->components.end();
+                        ++componentProgFIG0_8) {
+                    service = getService(*componentProgFIG0_8,
+                            ensemble->services);
+                    subchannel = getSubchannel(ensemble->subchannels,
+                            (*componentProgFIG0_8)->subchId);
+                    if (subchannel == ensemble->subchannels.end()) {
+                        etiLog.log(error,
+                                "Subchannel %i does not exist for component "
+                                "of service %i\n",
+                                (*componentProgFIG0_8)->subchId,
+                                (*componentProgFIG0_8)->serviceId);
+                        throw MuxInitException();
+                    }
+
+                    if (!(*service)->program)
+                        continue;
 
-                if (    transmitFIG0_13programme &&
-                        (*subchannel)->type == subchannel_type_t::Audio &&
-                        (*componentFIG0_13)->audio.uaType != 0xffff) {
                     if (fig0 == NULL) {
                         fig0 = (FIGtype0*)&etiFrame[index];
                         fig0->FIGtypeNumber = 0;
@@ -1375,45 +1167,89 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
                         fig0->CN = 0;
                         fig0->OE = 0;
                         fig0->PD = 0;
-                        fig0->Extension = 13;
+                        fig0->Extension = 8;
                         index += 2;
                         figSize += 2;
                     }
 
-                    if (figSize > 30 - (3+4+11)) {
-                        break;
+                    if ((*subchannel)->type == subchannel_type_t::Packet) {
+                        // Data packet
+
+                        if (figSize > 30 - 5) {
+                            break;
+                        }
+                        etiFrame[index] =
+                            ((*componentProgFIG0_8)->serviceId >> 8) & 0xFF;
+                        etiFrame[index+1] =
+                            ((*componentProgFIG0_8)->serviceId) & 0xFF;
+                        fig0->Length += 2;
+                        index += 2;
+                        figSize += 2;
+
+                        FIGtype0_8_long* definition =
+                            (FIGtype0_8_long*)&etiFrame[index];
+                        memset(definition, 0, 3);
+                        definition->ext = 0;    // no rfa
+                        definition->SCIdS = (*componentProgFIG0_8)->SCIdS;
+                        definition->LS = 1;
+                        definition->setSCId((*componentProgFIG0_8)->packet.id);
+                        fig0->Length += 3;
+                        index += 3;             // 8 minus rfa
+                        figSize += 3;
                     }
+                    else {    // Audio, data stream or FIDC
+                        if (figSize > 30 - 4) {
+                            break;
+                        }
+                        etiFrame[index] =
+                            ((*componentProgFIG0_8)->serviceId >> 8) & 0xFF;
+                        etiFrame[index+1] =
+                            ((*componentProgFIG0_8)->serviceId) & 0xFF;
 
-                    FIG0_13_shortAppInfo* info =
-                        (FIG0_13_shortAppInfo*)&etiFrame[index];
-                    info->SId = htonl((*componentFIG0_13)->serviceId) >> 16;
-                    info->SCIdS = (*componentFIG0_13)->SCIdS;
-                    info->No = 1;
-                    index += 3;
-                    figSize += 3;
-                    fig0->Length += 3;
-
-                    FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index];
-                    app->setType((*componentFIG0_13)->audio.uaType);
-                    app->length = 2;
-                    app->xpad = htons(0x0c3c);
-                    /* xpad meaning
-                       CA        = 0
-                       CAOrg     = 0
-                       Rfu       = 0
-                       AppTy(5)  = 12 (MOT, start of X-PAD data group)
-                       DG        = 0 (MSC data groups used)
-                       Rfu       = 0
-                       DSCTy(6)  = 60 (MOT)
-                       */
-
-                    index += 2 + app->length;
-                    figSize += 2 + app->length;
-                    fig0->Length += 2 + app->length;
+                        fig0->Length += 2;
+                        index += 2;
+                        figSize += 2;
+
+                        FIGtype0_8_short* definition =
+                            (FIGtype0_8_short*)&etiFrame[index];
+                        memset(definition, 0, 2);
+                        definition->ext = 0;    // no rfa
+                        definition->SCIdS = (*componentProgFIG0_8)->SCIdS;
+                        definition->LS = 0;
+                        definition->MscFic = 0;
+                        definition->Id = (*componentProgFIG0_8)->subchId;
+                        fig0->Length += 2;
+                        index += 2;             // 4 minus rfa
+                        figSize += 2;
+                    }
+                }
+                break;
+
+            case 1:     // FIG 0/8 data
+                fig0 = NULL;
+
+                if (componentDataFIG0_8 == ensemble->components.end()) {
+                    componentDataFIG0_8 = ensemble->components.begin();
                 }
-                else if (!transmitFIG0_13programme &&
-                        (*subchannel)->type == subchannel_type_t::Packet &&
-                        (*componentFIG0_13)->packet.appType != 0xffff) {
+                for (; componentDataFIG0_8 != ensemble->components.end();
+                        ++componentDataFIG0_8) {
+                    service = getService(*componentDataFIG0_8,
+                            ensemble->services);
+
+                    subchannel = getSubchannel(ensemble->subchannels,
+                            (*componentDataFIG0_8)->subchId);
+
+                    if (subchannel == ensemble->subchannels.end()) {
+                        etiLog.log(error,
+                                "Subchannel %i does not exist for component "
+                                "of service %i\n",
+                                (*componentDataFIG0_8)->subchId,
+                                (*componentDataFIG0_8)->serviceId);
+                        throw MuxInitException();
+                    }
+
+                    if ((*service)->program)
+                        continue;
 
                     if (fig0 == NULL) {
                         fig0 = (FIGtype0*)&etiFrame[index];
@@ -1422,249 +1258,413 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu
                         fig0->CN = 0;
                         fig0->OE = 0;
                         fig0->PD = 1;
-                        fig0->Extension = 13;
+                        fig0->Extension = 8;
                         index += 2;
                         figSize += 2;
                     }
 
-                    if (figSize > 30 - (5+2)) {
-                        break;
+                    if ((*subchannel)->type == subchannel_type_t::Packet) {
+                        // Data packet
+
+                        if (figSize > 30 - 7) {
+                            break;
+                        }
+                        etiFrame[index] =
+                            ((*componentDataFIG0_8)->serviceId >> 8) & 0xFF;
+                        etiFrame[index+1] =
+                            ((*componentDataFIG0_8)->serviceId) & 0xFF;
+                        fig0->Length += 4;
+                        index += 4;
+                        figSize += 4;
+
+                        FIGtype0_8_long* definition =
+                            (FIGtype0_8_long*)&etiFrame[index];
+                        memset(definition, 0, 3);
+                        definition->ext = 0;    // no rfa
+                        definition->SCIdS = (*componentDataFIG0_8)->SCIdS;
+                        definition->LS = 1;
+                        definition->setSCId((*componentDataFIG0_8)->packet.id);
+                        fig0->Length += 3;
+                        index += 3;             // 8 minus rfa
+                        figSize += 3;
+                    }
+                    else {    // Audio, data stream or FIDC
+                        if (figSize > 30 - 6) {
+                            break;
+                        }
+                        etiFrame[index] =
+                            ((*componentDataFIG0_8)->serviceId >> 8) & 0xFF;
+                        etiFrame[index+1] =
+                            ((*componentDataFIG0_8)->serviceId) & 0xFF;
+                        fig0->Length += 4;
+                        index += 4;
+                        figSize += 4;
+
+                        FIGtype0_8_short* definition =
+                            (FIGtype0_8_short*)&etiFrame[index];
+                        memset(definition, 0, 2);
+                        definition->ext = 0;    // no rfa
+                        definition->SCIdS = (*componentDataFIG0_8)->SCIdS;
+                        definition->LS = 0;
+                        definition->MscFic = 0;
+                        definition->Id = (*componentDataFIG0_8)->subchId;
+                        fig0->Length += 2;
+                        index += 2;             // 4 minus rfa
+                        figSize += 2;
                     }
+                }
+                break;
 
-                    FIG0_13_longAppInfo* info =
-                        (FIG0_13_longAppInfo*)&etiFrame[index];
-                    info->SId = htonl((*componentFIG0_13)->serviceId);
-                    info->SCIdS = (*componentFIG0_13)->SCIdS;
-                    info->No = 1;
-                    index += 5;
-                    figSize += 5;
-                    fig0->Length += 5;
-
-                    FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index];
-                    app->setType((*componentFIG0_13)->packet.appType);
-                    app->length = 0;
-                    index += 2;
-                    figSize += 2;
-                    fig0->Length += 2;
+            case 3:
+                // FIG type 1/0, Service Information (SI), Ensemble Label
+                fig1_0 = (FIGtype1_0 *) & etiFrame[index];
+
+                fig1_0->Length = 21;
+                fig1_0->FIGtypeNumber = 1;
+                fig1_0->Extension = 0;
+                fig1_0->OE = 0;
+                fig1_0->Charset = 0;
+                fig1_0->EId = htons(ensemble->id);
+                index = index + 4;
+
+                ensemble->label.writeLabel(&etiFrame[index]);
+                index = index + 16;
+
+                etiFrame[index++] = ensemble->label.flag() >> 8;
+                etiFrame[index++] = ensemble->label.flag() & 0xFF;
+
+                figSize += 22;
+                break;
+
+            case 5:
+            case 6:
+                // FIG 0 / 13
+                fig0 = NULL;
+
+                if (componentFIG0_13 == ensemble->components.end()) {
+                    componentFIG0_13 = ensemble->components.begin();
+
+                    transmitFIG0_13programme = !transmitFIG0_13programme;
+                    // Alternate between data and and programme FIG0/13,
+                    // do not mix fig0 with PD=0 with extension 13 stuff
+                    // that actually needs PD=1, and vice versa
                 }
-            }
-            break;
 
-        case 7:
-            //Time and country identifier
-            fig0_10 = (FIGtype0_10 *) & etiFrame[index];
-
-            fig0_10->FIGtypeNumber = 0;
-            fig0_10->Length = 5;
-            fig0_10->CN = 0;
-            fig0_10->OE = 0;
-            fig0_10->PD = 0;
-            fig0_10->Extension = 10;
-            index = index + 2;
-
-            timeData = gmtime(&date);
-
-            fig0_10->RFU = 0;
-            fig0_10->setMJD(gregorian2mjd(timeData->tm_year + 1900,
-                        timeData->tm_mon + 1,
-                        timeData->tm_mday));
-            fig0_10->LSI = 0;
-            fig0_10->ConfInd = (m_watermarkData[m_watermarkPos >> 3] >>
-                    (7 - (m_watermarkPos & 0x07))) & 1;
-            if (++m_watermarkPos == m_watermarkSize) {
-                m_watermarkPos = 0;
-            }
-            fig0_10->UTC = 0;
-            fig0_10->setHours(timeData->tm_hour);
-            fig0_10->Minutes = timeData->tm_min;
-            index = index + 4;
-            figSize += 6;
-
-            fig0_9 = (FIGtype0_9*)&etiFrame[index];
-            fig0_9->FIGtypeNumber = 0;
-            fig0_9->Length = 4;
-            fig0_9->CN = 0;
-            fig0_9->OE = 0;
-            fig0_9->PD = 0;
-            fig0_9->Extension = 9;
-
-            fig0_9->ext = 0;
-            fig0_9->lto = 0; // Unique LTO for ensemble
-
-            if (ensemble->lto_auto) {
-                time_t now = time(NULL);
-                struct tm* ltime = localtime(&now);
-                time_t now2 = timegm(ltime);
-                ensemble->lto = (now2 - now) / 1800;
-            }
+                for (; componentFIG0_13 != ensemble->components.end();
+                        ++componentFIG0_13) {
 
-            if (ensemble->lto >= 0) {
-                fig0_9->ensembleLto = ensemble->lto;
-            }
-            else {
-                /* Convert to 1-complement representation */
-                fig0_9->ensembleLto = (-ensemble->lto) | (1<<5);
-            }
+                    subchannel = getSubchannel(ensemble->subchannels,
+                            (*componentFIG0_13)->subchId);
 
-            fig0_9->ensembleEcc = ensemble->ecc;
-            fig0_9->tableId = ensemble->international_table;
-            index += 5;
-            figSize += 5;
+                    if (subchannel == ensemble->subchannels.end()) {
+                        etiLog.log(error,
+                                "Subchannel %i does not exist for component "
+                                "of service %i\n",
+                                (*componentFIG0_13)->subchId,
+                                (*componentFIG0_13)->serviceId);
+                        throw MuxInitException();
+                    }
 
-            break;
-    }
+                    if (    transmitFIG0_13programme &&
+                            (*subchannel)->type == subchannel_type_t::Audio &&
+                            (*componentFIG0_13)->audio.uaType != 0xffff) {
+                        if (fig0 == NULL) {
+                            fig0 = (FIGtype0*)&etiFrame[index];
+                            fig0->FIGtypeNumber = 0;
+                            fig0->Length = 1;
+                            fig0->CN = 0;
+                            fig0->OE = 0;
+                            fig0->PD = 0;
+                            fig0->Extension = 13;
+                            index += 2;
+                            figSize += 2;
+                        }
 
-    if (figSize > 30) {
-        etiLog.log(error,
-                "FIB1 overload (%i > 30)\n", figSize);
-        throw MuxInitException();
-    }
+                        if (figSize > 30 - (3+4+11)) {
+                            break;
+                        }
 
-    memcpy(&etiFrame[index], Padding_FIB, 30 - figSize);
-    index += 30 - figSize;
+                        FIG0_13_shortAppInfo* info =
+                            (FIG0_13_shortAppInfo*)&etiFrame[index];
+                        info->SId = htonl((*componentFIG0_13)->serviceId) >> 16;
+                        info->SCIdS = (*componentFIG0_13)->SCIdS;
+                        info->No = 1;
+                        index += 3;
+                        figSize += 3;
+                        fig0->Length += 3;
+
+                        FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index];
+                        app->setType((*componentFIG0_13)->audio.uaType);
+                        app->length = 2;
+                        app->xpad = htons(0x0c3c);
+                        /* xpad meaning
+                           CA        = 0
+                           CAOrg     = 0
+                           Rfu       = 0
+                           AppTy(5)  = 12 (MOT, start of X-PAD data group)
+                           DG        = 0 (MSC data groups used)
+                           Rfu       = 0
+                           DSCTy(6)  = 60 (MOT)
+                           */
+
+                        index += 2 + app->length;
+                        figSize += 2 + app->length;
+                        fig0->Length += 2 + app->length;
+                    }
+                    else if (!transmitFIG0_13programme &&
+                            (*subchannel)->type == subchannel_type_t::Packet &&
+                            (*componentFIG0_13)->packet.appType != 0xffff) {
+
+                        if (fig0 == NULL) {
+                            fig0 = (FIGtype0*)&etiFrame[index];
+                            fig0->FIGtypeNumber = 0;
+                            fig0->Length = 1;
+                            fig0->CN = 0;
+                            fig0->OE = 0;
+                            fig0->PD = 1;
+                            fig0->Extension = 13;
+                            index += 2;
+                            figSize += 2;
+                        }
 
-    CRCtmp = 0xffff;
-    CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
-    CRCtmp ^= 0xffff;
-    etiFrame[index++] = ((char *) &CRCtmp)[1];
-    etiFrame[index++] = ((char *) &CRCtmp)[0];
+                        if (figSize > 30 - (5+2)) {
+                            break;
+                        }
 
+                        FIG0_13_longAppInfo* info =
+                            (FIG0_13_longAppInfo*)&etiFrame[index];
+                        info->SId = htonl((*componentFIG0_13)->serviceId);
+                        info->SCIdS = (*componentFIG0_13)->SCIdS;
+                        info->No = 1;
+                        index += 5;
+                        figSize += 5;
+                        fig0->Length += 5;
+
+                        FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index];
+                        app->setType((*componentFIG0_13)->packet.appType);
+                        app->length = 0;
+                        index += 2;
+                        figSize += 2;
+                        fig0->Length += 2;
+                    }
+                }
+                break;
 
-    figSize = 0;
-    // FIB 2 insertion
-    if (rotateFIB < ensemble->services.size()) {
-        service = ensemble->services.begin() + rotateFIB;
+            case 7:
+                //Time and country identifier
+                fig0_10 = (FIGtype0_10 *) & etiFrame[index];
+
+                fig0_10->FIGtypeNumber = 0;
+                fig0_10->Length = 5;
+                fig0_10->CN = 0;
+                fig0_10->OE = 0;
+                fig0_10->PD = 0;
+                fig0_10->Extension = 10;
+                index = index + 2;
+
+                timeData = gmtime(&date);
+
+                fig0_10->RFU = 0;
+                fig0_10->setMJD(gregorian2mjd(timeData->tm_year + 1900,
+                            timeData->tm_mon + 1,
+                            timeData->tm_mday));
+                fig0_10->LSI = 0;
+                fig0_10->ConfInd = (m_watermarkData[m_watermarkPos >> 3] >>
+                        (7 - (m_watermarkPos & 0x07))) & 1;
+                if (++m_watermarkPos == m_watermarkSize) {
+                    m_watermarkPos = 0;
+                }
+                fig0_10->UTC = 0;
+                fig0_10->setHours(timeData->tm_hour);
+                fig0_10->Minutes = timeData->tm_min;
+                index = index + 4;
+                figSize += 6;
+
+                fig0_9 = (FIGtype0_9*)&etiFrame[index];
+                fig0_9->FIGtypeNumber = 0;
+                fig0_9->Length = 4;
+                fig0_9->CN = 0;
+                fig0_9->OE = 0;
+                fig0_9->PD = 0;
+                fig0_9->Extension = 9;
+
+                fig0_9->ext = 0;
+                fig0_9->lto = 0; // Unique LTO for ensemble
+
+                if (ensemble->lto_auto) {
+                    time_t now = time(NULL);
+                    struct tm* ltime = localtime(&now);
+                    time_t now2 = timegm(ltime);
+                    ensemble->lto = (now2 - now) / 1800;
+                }
 
-        // FIG type 1/1, SI, Service label, one instance per subchannel
-        if ((*service)->getType(ensemble) == subchannel_type_t::Audio) {
-            fig1_1 = (FIGtype1_1 *) & etiFrame[index];
+                if (ensemble->lto >= 0) {
+                    fig0_9->ensembleLto = ensemble->lto;
+                }
+                else {
+                    /* Convert to 1-complement representation */
+                    fig0_9->ensembleLto = (-ensemble->lto) | (1<<5);
+                }
 
-            fig1_1->FIGtypeNumber = 1;
-            fig1_1->Length = 21;
-            fig1_1->Charset = 0;
-            fig1_1->OE = 0;
-            fig1_1->Extension = 1;
+                fig0_9->ensembleEcc = ensemble->ecc;
+                fig0_9->tableId = ensemble->international_table;
+                index += 5;
+                figSize += 5;
 
-            fig1_1->Sld = htons((*service)->id);
-            index += 4;
-            figSize += 4;
+                break;
         }
-        else {
-            fig1_5 = (FIGtype1_5 *) & etiFrame[index];
-            fig1_5->FIGtypeNumber = 1;
-            fig1_5->Length = 23;
-            fig1_5->Charset = 0;
-            fig1_5->OE = 0;
-            fig1_5->Extension = 5;
-
-            fig1_5->SId = htonl((*service)->id);
-            index += 6;
-            figSize += 6;
+
+        if (figSize > 30) {
+            etiLog.log(error,
+                    "FIB1 overload (%i > 30)\n", figSize);
+            throw MuxInitException();
         }
-        (*service)->label.writeLabel(&etiFrame[index]);
-        index += 16;
-        figSize += 16;
-        etiFrame[index++] = (*service)->label.flag() >> 8;
-        etiFrame[index++] = (*service)->label.flag() & 0xFF;
-        figSize += 2;
-    }
-    else if (rotateFIB <
-            ensemble->services.size() + ensemble->components.size()) {
-        component = ensemble->components.begin() +
-            (rotateFIB - ensemble->services.size());
 
-        service = getService(*component, ensemble->services);
+        memcpy(&etiFrame[index], Padding_FIB, 30 - figSize);
+        index += 30 - figSize;
+
+        CRCtmp = 0xffff;
+        CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
+        CRCtmp ^= 0xffff;
+        etiFrame[index++] = ((char *) &CRCtmp)[1];
+        etiFrame[index++] = ((char *) &CRCtmp)[0];
+
 
-        subchannel =
-            getSubchannel(ensemble->subchannels, (*component)->subchId);
+        figSize = 0;
+        // FIB 2 insertion
+        if (rotateFIB < ensemble->services.size()) {
+            service = ensemble->services.begin() + rotateFIB;
 
-        if (not (*component)->label.long_label().empty() ) {
+            // FIG type 1/1, SI, Service label, one instance per subchannel
             if ((*service)->getType(ensemble) == subchannel_type_t::Audio) {
-                // Programme
-                FIGtype1_4_programme *fig1_4;
-                fig1_4 = (FIGtype1_4_programme*)&etiFrame[index];
-
-                fig1_4->FIGtypeNumber = 1;
-                fig1_4->Length = 22;
-                fig1_4->Charset = 0;
-                fig1_4->OE = 0;
-                fig1_4->Extension = 4;
-                fig1_4->PD = 0;
-                fig1_4->rfa = 0;
-                fig1_4->SCIdS = (*component)->SCIdS;
-
-                fig1_4->SId = htons((*service)->id);
-                index += 5;
-                figSize += 5;
+                fig1_1 = (FIGtype1_1 *) & etiFrame[index];
+
+                fig1_1->FIGtypeNumber = 1;
+                fig1_1->Length = 21;
+                fig1_1->Charset = 0;
+                fig1_1->OE = 0;
+                fig1_1->Extension = 1;
+
+                fig1_1->Sld = htons((*service)->id);
+                index += 4;
+                figSize += 4;
             }
-            else {    // Data
-                FIGtype1_4_data *fig1_4;
-                fig1_4 = (FIGtype1_4_data *) & etiFrame[index];
-                fig1_4->FIGtypeNumber = 1;
-                fig1_4->Length = 24;
-                fig1_4->Charset = 0;
-                fig1_4->OE = 0;
-                fig1_4->Extension = 4;
-                fig1_4->PD = 1;
-                fig1_4->rfa = 0;
-                fig1_4->SCIdS = (*component)->SCIdS;
-
-                fig1_4->SId = htonl((*service)->id);
-                index += 7;
-                figSize += 7;
+            else {
+                fig1_5 = (FIGtype1_5 *) & etiFrame[index];
+                fig1_5->FIGtypeNumber = 1;
+                fig1_5->Length = 23;
+                fig1_5->Charset = 0;
+                fig1_5->OE = 0;
+                fig1_5->Extension = 5;
+
+                fig1_5->SId = htonl((*service)->id);
+                index += 6;
+                figSize += 6;
             }
-            (*component)->label.writeLabel(&etiFrame[index]);
+            (*service)->label.writeLabel(&etiFrame[index]);
             index += 16;
             figSize += 16;
-
-            etiFrame[index++] = (*component)->label.flag() >> 8;
-            etiFrame[index++] = (*component)->label.flag() & 0xFF;
+            etiFrame[index++] = (*service)->label.flag() >> 8;
+            etiFrame[index++] = (*service)->label.flag() & 0xFF;
             figSize += 2;
         }
-    }
+        else if (rotateFIB <
+                ensemble->services.size() + ensemble->components.size()) {
+            component = ensemble->components.begin() +
+                (rotateFIB - ensemble->services.size());
 
-    if (figSize > 30) {
-        etiLog.log(error,
-                "FIB2 overload (%i > 30)\n", figSize);
-        throw MuxInitException();
-    }
-    memcpy(&etiFrame[index], Padding_FIB, 30 - figSize);
-    index += 30 - figSize;
+            service = getService(*component, ensemble->services);
 
-    CRCtmp = 0xffff;
-    CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
-    CRCtmp ^= 0xffff;
-    etiFrame[index++] = ((char *) &CRCtmp)[1];
-    etiFrame[index++] = ((char *) &CRCtmp)[0];
+            subchannel =
+                getSubchannel(ensemble->subchannels, (*component)->subchId);
 
-    /* ETSI EN 300 799 Table 2:
-     * Only TM3 has a FIB count to CIF count that is
-     * not 3 to 1.
-     */
-    if (ensemble->mode == 3) {
-        memcpy(&etiFrame[index], Padding_FIB, 30);
-        /* Fill FIB3 with padding */
-        index += 30;
+            if (not (*component)->label.long_label().empty() ) {
+                if ((*service)->getType(ensemble) == subchannel_type_t::Audio) {
+                    // Programme
+                    FIGtype1_4_programme *fig1_4;
+                    fig1_4 = (FIGtype1_4_programme*)&etiFrame[index];
+
+                    fig1_4->FIGtypeNumber = 1;
+                    fig1_4->Length = 22;
+                    fig1_4->Charset = 0;
+                    fig1_4->OE = 0;
+                    fig1_4->Extension = 4;
+                    fig1_4->PD = 0;
+                    fig1_4->rfa = 0;
+                    fig1_4->SCIdS = (*component)->SCIdS;
+
+                    fig1_4->SId = htons((*service)->id);
+                    index += 5;
+                    figSize += 5;
+                }
+                else {    // Data
+                    FIGtype1_4_data *fig1_4;
+                    fig1_4 = (FIGtype1_4_data *) & etiFrame[index];
+                    fig1_4->FIGtypeNumber = 1;
+                    fig1_4->Length = 24;
+                    fig1_4->Charset = 0;
+                    fig1_4->OE = 0;
+                    fig1_4->Extension = 4;
+                    fig1_4->PD = 1;
+                    fig1_4->rfa = 0;
+                    fig1_4->SCIdS = (*component)->SCIdS;
+
+                    fig1_4->SId = htonl((*service)->id);
+                    index += 7;
+                    figSize += 7;
+                }
+                (*component)->label.writeLabel(&etiFrame[index]);
+                index += 16;
+                figSize += 16;
+
+                etiFrame[index++] = (*component)->label.flag() >> 8;
+                etiFrame[index++] = (*component)->label.flag() & 0xFF;
+                figSize += 2;
+            }
+        }
+
+        if (figSize > 30) {
+            etiLog.log(error,
+                    "FIB2 overload (%i > 30)\n", figSize);
+            throw MuxInitException();
+        }
+        memcpy(&etiFrame[index], Padding_FIB, 30 - figSize);
+        index += 30 - figSize;
 
         CRCtmp = 0xffff;
         CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
         CRCtmp ^= 0xffff;
         etiFrame[index++] = ((char *) &CRCtmp)[1];
         etiFrame[index++] = ((char *) &CRCtmp)[0];
-    }
 
-    if (ensemble->services.size() > 30) {
-        etiLog.log(error,
-                "Sorry, but this software currently can't write "
-                "Service Label of more than 30 services.\n");
-        throw MuxInitException();
-    }
+        /* ETSI EN 300 799 Table 2:
+         * Only TM3 has a FIB count to CIF count that is
+         * not 3 to 1.
+         */
+        if (ensemble->mode == 3) {
+            memcpy(&etiFrame[index], Padding_FIB, 30);
+            /* Fill FIB3 with padding */
+            index += 30;
+
+            CRCtmp = 0xffff;
+            CRCtmp = crc16(CRCtmp, &etiFrame[(index - 30)], 30);
+            CRCtmp ^= 0xffff;
+            etiFrame[index++] = ((char *) &CRCtmp)[1];
+            etiFrame[index++] = ((char *) &CRCtmp)[0];
+        }
+
+        if (ensemble->services.size() > 30) {
+            etiLog.log(error,
+                    "Sorry, but this software currently can't write "
+                    "Service Label of more than 30 services.\n");
+            throw MuxInitException();
+        }
 
-    // counter for FIG 0/0
-    insertFIG = (insertFIG + 1) % 16;
+        // counter for FIG 0/0
+        insertFIG = (insertFIG + 1) % 16;
 
-    // We rotate through the FIBs every 30 frames
-    rotateFIB = (rotateFIB + 1) % 30;
+        // We rotate through the FIBs every 30 frames
+        rotateFIB = (rotateFIB + 1) % 30;
     }
 
     /**********************************************************************