Combine FIG0/2 Data and Prog

1 files changed, 2 insertions, 111 deletions

diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp
index eb78269..b1377e4 100644
--- a/src/fig/FIGCarousel.cpp
+++ b/src/fig/FIGCarousel.cpp
@@ -165,117 +165,8 @@ void fib0 {
             break;
 
         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;
-                }
-
-                unsigned char type = (*serviceDataFIG0_2)->getType(ensemble);
-                if ((type == 0) || (type == 2)) {
-                    continue;
-                }
-
-                ++cur;
-
-                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;
-                }
-
-                if (figSize + 5
-                        + (*serviceDataFIG0_2)->nbComponent(ensemble->components)
-                        * 2 > 30) {
-                    break;
-                }
-
-                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;
-
-                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 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 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 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;
-                }
-            }
+            // FIG type 0/2 for Data
+            //  ERASED
             break;
 
         case 5: