Remove old carousel

1 files changed, 0 insertions, 397 deletions

diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h
index 3e16141..a312b5b 100644
--- a/src/DabMultiplexer.h
+++ b/src/DabMultiplexer.h
@@ -46,7 +46,6 @@
 #include "RemoteControl.h"
 #include "Eti.h"
 #include "ClockTAI.h"
-#include <exception>
 #include <vector>
 #include <chrono>
 #include <memory>
@@ -54,18 +53,6 @@
 #include <memory>
 #include <boost/property_tree/ptree.hpp>
 
-class MuxInitException : public std::exception
-{
-    public:
-        MuxInitException(const std::string m = "ODR-DabMux initialisation error")
-            throw()
-            : msg(m) {}
-        ~MuxInitException(void) throw() {}
-        const char* what() const throw() { return msg.c_str(); }
-    private:
-        std::string msg;
-};
-
 class DabMultiplexer : public RemoteControllable {
     public:
         DabMultiplexer(
@@ -109,23 +96,6 @@ class DabMultiplexer : public RemoteControllable {
         uint32_t sync;
         unsigned long currentFrame;
 
-        /* FIG carousel logic and iterators */
-        unsigned int insertFIG;
-        unsigned int rotateFIB;
-
-        std::vector<std::shared_ptr<DabService> >::iterator serviceProgFIG0_2;
-        std::vector<std::shared_ptr<DabService> >::iterator serviceDataFIG0_2;
-        std::vector<std::shared_ptr<DabService> >::iterator serviceFIG0_17;
-
-        std::vector<DabComponent*>::iterator componentProgFIG0_8;
-        std::vector<DabComponent*>::iterator componentDataFIG0_8;
-        std::vector<DabComponent*>::iterator componentFIG0_13;
-        // Alternate between programme and data
-        bool transmitFIG0_13programme;
-
-
-        std::vector<dabSubchannel*>::iterator subchannelFIG0_1;
-
         std::shared_ptr<dabEnsemble> ensemble;
 
         // Multiplex reconfiguration requires two sets of configurations
@@ -145,7 +115,6 @@ class DabMultiplexer : public RemoteControllable {
 #endif // HAVE_OUTPUT_EDI
 
         /* New FIG Carousel */
-        bool m_use_new_fig_carousel;
         FIC::FIGCarousel fig_carousel;
 };
 
@@ -171,371 +140,5 @@ class DabMultiplexer : public RemoteControllable {
 #define DEFAULT_SERVICE_ID      50
 #define DEFAULT_PACKET_ADDRESS  0
 
-
-/*****************************************************************************
- *****************   Definition of FIG structures ****************************
- *****************************************************************************/
-
-#ifdef _WIN32
-#   pragma pack(push)
-#endif
-
-struct FIGtype0 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-} PACKED;
-
-
-struct FIGtype0_0 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-
-    uint16_t EId;
-    uint8_t CIFcnt_hight:5;
-    uint8_t Al:1;
-    uint8_t Change:2;
-    uint8_t CIFcnt_low:8;
-} PACKED;
-
-
-struct FIGtype0_2 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-} PACKED;
-
-
-struct FIGtype0_2_Service {
-    uint16_t SId;
-    uint8_t NbServiceComp:4;
-    uint8_t CAId:3;
-    uint8_t Local_flag:1;
-} PACKED;
-
-
-struct FIGtype0_2_Service_data {
-    uint32_t SId;
-    uint8_t NbServiceComp:4;
-    uint8_t CAId:3;
-    uint8_t Local_flag:1;
-} PACKED;
-
-
-struct FIGtype0_2_audio_component {
-    uint8_t ASCTy:6;
-    uint8_t TMid:2;
-    uint8_t CA_flag:1;
-    uint8_t PS:1;
-    uint8_t SubChId:6;
-} PACKED;
-
-
-struct FIGtype0_2_data_component {
-    uint8_t DSCTy:6;
-    uint8_t TMid:2;
-    uint8_t CA_flag:1;
-    uint8_t PS:1;
-    uint8_t SubChId:6;
-} PACKED;
-
-
-struct FIGtype0_2_packet_component {
-    uint8_t SCId_high:6;
-    uint8_t TMid:2;
-    uint8_t CA_flag:1;
-    uint8_t PS:1;
-    uint8_t SCId_low:6;
-    void setSCId(uint16_t SCId) {
-        SCId_high = SCId >> 6;
-        SCId_low = SCId & 0x3f;
-    }
-} PACKED;
-
-
-struct FIGtype0_3_header {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-} PACKED;
-
-
-/* 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.
- */
-struct FIGtype0_3_data {
-    uint8_t SCId_high;
-    uint8_t SCCA_flag:1;
-    uint8_t rfa:3;
-    uint8_t SCId_low:4;
-    uint8_t DSCTy:6;
-    uint8_t rfu:1;
-    uint8_t DG_flag:1;
-    uint8_t Packet_address_high:2;
-    uint8_t SubChId:6;
-    uint8_t Packet_address_low;
-    uint16_t SCCA;
-    void setSCId(uint16_t SCId) {
-        SCId_high = SCId >> 4;
-        SCId_low = SCId & 0xf;
-    }
-    void setPacketAddress(uint16_t address) {
-        Packet_address_high = address >> 8;
-        Packet_address_low = address & 0xff;
-    }
-} PACKED;
-
-
-struct FIGtype0_8_short {
-    uint8_t SCIdS:4;
-    uint8_t rfa_1:3;
-    uint8_t ext:1;
-    uint8_t Id:6;
-    uint8_t MscFic:1;
-    uint8_t LS:1;
-    uint8_t rfa_2;
-} PACKED;
-
-
-struct FIGtype0_8_long {
-    uint8_t SCIdS:4;
-    uint8_t rfa_1:3;
-    uint8_t ext:1;
-    uint8_t SCId_high:4;
-    uint8_t rfa:3;
-    uint8_t LS:1;
-    uint8_t SCId_low;
-    uint8_t rfa_2;
-    void setSCId(uint16_t id) {
-        SCId_high = id >> 8;
-        SCId_low = id & 0xff;
-    }
-    uint16_t getSCid() {
-        return (SCId_high << 8) | SCId_low;
-    }
-} PACKED;
-
-
-struct FIGtype0_9 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-
-    uint8_t ensembleLto:6;
-    uint8_t lto:1;
-    uint8_t ext:1;
-    uint8_t ensembleEcc;
-    uint8_t tableId;
-} PACKED;
-
-
-struct FIGtype0_10 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-
-    uint8_t MJD_high:7;
-    uint8_t RFU:1;
-    uint8_t MJD_med;
-    uint8_t Hours_high:3;
-    uint8_t UTC:1;
-    uint8_t ConfInd:1;
-    uint8_t LSI:1;
-    uint8_t MJD_low:2;
-    uint8_t Minutes:6;
-    uint8_t Hours_low:2;
-    void setMJD(uint32_t date) {
-        MJD_high = (date >> 10) & 0x7f;
-        MJD_med = (date >> 2) & 0xff;
-        MJD_low = date & 0x03;
-    }
-    void setHours(uint16_t hours) {
-        Hours_high = (hours >> 2) & 0x07;
-        Hours_low = hours & 0x03;
-    }
-} PACKED;
-
-
-struct FIGtype0_17_programme {
-    uint16_t SId;
-    uint8_t NFC:2;
-    uint8_t Rfa:2;
-    uint8_t CC:1; // Complimentary code
-    uint8_t L:1; // Signals presence of language field
-    uint8_t PS:1; // Primary/Secondary
-    // PS==0: language refers to primary service component
-    // PS==1: language refers to secondary service component
-    uint8_t SD:1; // Static/Dynamic
-    // SD==0: PTy and language may not represent the current programme contents
-    // SD==1: PTy and language represent the current programme contents
-} PACKED;
-
-struct FIGtype0_18 {
-    uint16_t SId;
-    uint16_t ASu;
-    uint8_t  NumClusters:5;
-    uint8_t  Rfa:3;
-    /* Followed by uint8_t Cluster IDs */
-} PACKED;
-
-struct FIGtype0_19 {
-    uint8_t  ClusterId;
-    uint16_t ASw;
-    uint8_t  SubChId:6;
-    uint8_t  RegionFlag:1; // shall be zero
-    uint8_t  NewFlag:1;
-    // Region and RFa not supported
-} PACKED;
-
-struct FIGtype0_1 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:5;
-    uint8_t PD:1;
-    uint8_t OE:1;
-    uint8_t CN:1;
-} PACKED;
-
-
-struct FIG_01_SubChannel_ShortF {
-    uint8_t StartAdress_high:2;
-    uint8_t SubChId:6;
-    uint8_t StartAdress_low:8;
-    uint8_t TableIndex:6;
-    uint8_t TableSwitch:1;
-    uint8_t Short_Long_form:1;
-} PACKED;
-
-
-struct FIG_01_SubChannel_LongF {
-    uint8_t StartAdress_high:2;
-    uint8_t SubChId:6;
-    uint8_t StartAdress_low:8;
-    uint8_t Sub_ChannelSize_high:2;
-    uint8_t ProtectionLevel:2;
-    uint8_t Option:3;
-    uint8_t Short_Long_form:1;
-    uint8_t Sub_ChannelSize_low:8;
-} PACKED;
-
-
-// See EN 300 401, Clause 8.1.20 for the FIG0_13 description
-struct FIG0_13_shortAppInfo {
-    uint16_t SId;
-    uint8_t No:4;
-    uint8_t SCIdS:4;
-} PACKED;
-
-
-struct FIG0_13_longAppInfo {
-    uint32_t SId;
-    uint8_t No:4;
-    uint8_t SCIdS:4;
-} PACKED;
-
-
-struct FIG0_13_app {
-    uint8_t typeHigh;
-    uint8_t length:5;
-    uint8_t typeLow:3;
-    void setType(uint16_t type) {
-        typeHigh = type >> 3;
-        typeLow = type & 0x1f;
-    }
-    uint16_t xpad;
-} PACKED;
-
-#define FIG0_13_APPTYPE_SLIDESHOW  0x2
-#define FIG0_13_APPTYPE_WEBSITE    0x3
-#define FIG0_13_APPTYPE_TPEG       0x4
-#define FIG0_13_APPTYPE_DGPS       0x5
-#define FIG0_13_APPTYPE_TMC        0x6
-#define FIG0_13_APPTYPE_EPG        0x7
-#define FIG0_13_APPTYPE_DABJAVA    0x8
-#define FIG0_13_APPTYPE_JOURNALINE 0x441
-
-
-struct FIGtype1_0 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:3;
-    uint8_t OE:1;
-    uint8_t Charset:4;
-
-    uint16_t EId;
-} PACKED;
-
-
-struct FIGtype1_1 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:3;
-    uint8_t OE:1;
-    uint8_t Charset:4;
-
-    uint16_t Sld;
-} PACKED;
-
-
-struct FIGtype1_5 {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:3;
-    uint8_t OE:1;
-    uint8_t Charset:4;
-    uint32_t SId;
-} PACKED;
-
-
-struct FIGtype1_4_programme {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:3;
-    uint8_t OE:1;
-    uint8_t Charset:4;
-    uint8_t SCIdS:4;
-    uint8_t rfa:3;
-    uint8_t PD:1;
-    uint16_t SId;
-} PACKED;
-
-
-struct FIGtype1_4_data {
-    uint8_t Length:5;
-    uint8_t FIGtypeNumber:3;
-    uint8_t Extension:3;
-    uint8_t OE:1;
-    uint8_t Charset:4;
-    uint8_t SCIdS:4;
-    uint8_t rfa:3;
-    uint8_t PD:1;
-    uint32_t SId;
-} PACKED;
-
-
-#ifdef _WIN32
-#   pragma pack(pop)
-#endif
-
 #endif