Remove service linking active from RC

This can be added later if the need arises, and when proper testing
validates the implementation.

10 files changed, 69 insertions, 214 deletions

diff --git a/TODO b/TODO
index 50fc9b8..fb56034 100644
--- a/TODO
+++ b/TODO
@@ -18,11 +18,12 @@ Initial work started in http://git.mpb.li/git/odr-edilib/
 
 Explicit Service Linking
 ------------------------
-At the moment there is no support to signal explicit service linking.
-Implementing this needs a definition of how it should look like in the
-configuration file and in the remote control, and adding new FIGs to signal the
-necessary information.
+It is impossible to activate/deactive linkage sets. Commit 5c3c6d7 added
+some code to transmit a FIG0/6 CEI, but this was subsequently reverted
+because it was not tested enough.
 
+Announcement of other frequencies on which to find programmes using FIG 0/21 is
+also missing.
 
 Inputs for packet data
 ----------------------
diff --git a/doc/servicelinking.mux b/doc/servicelinking.mux
index 38c59ee..f50b3fa 100644
--- a/doc/servicelinking.mux
+++ b/doc/servicelinking.mux
@@ -7,7 +7,7 @@
 ;
 general {
     dabmode 1
-    nbframes 10000
+    nbframes 0
 
     syslog false
     tist false
@@ -29,10 +29,6 @@ linking {
         ; (mandatory)
         lsn 0xabc
 
-        ; whether this link is active or a "potential future link or de-activated link"
-        ; This field is also part of the remote control. (default false)
-        active true
-
         ; Hard link means that all services carry the same programme, soft links means
         ; that the programmes are related in some way. (default true)
         hard true
@@ -78,7 +74,6 @@ linking {
     ; And now an international true to test more options
     set-ri {
         lsn 0xdef
-        active false
         hard soft
         international true
         keyservice srv-ri
@@ -162,5 +157,6 @@ components {
 
 outputs {
     file "file://./test.eti?type=raw"
+    throttle "simul://"
 }
 
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 1b6093e..7219663 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -137,7 +137,6 @@ static void parse_linkage(boost::property_tree::ptree& pt,
                 throw runtime_error("Invalid service linking definition");
             }
 
-            bool active = pt_set.get("active", false);
             bool hard = pt_set.get("hard", true);
             bool international = pt_set.get("international", false);
 
@@ -149,8 +148,7 @@ static void parse_linkage(boost::property_tree::ptree& pt,
             }
 
             auto linkageset = make_shared<LinkageSet>(setuid, lsn, hard, international);
-            linkageset->data.active = active;
-            linkageset->data.keyservice = service_uid; // TODO check if it exists
+            linkageset->keyservice = service_uid; // TODO check if it exists
 
             auto pt_list = pt_set.get_child_optional("list");
             if (not pt_list) {
@@ -195,7 +193,7 @@ static void parse_linkage(boost::property_tree::ptree& pt,
                     link.ecc = 0;
                 }
 
-                linkageset->data.id_list.push_back(link);
+                linkageset->id_list.push_back(link);
             }
             ensemble->linkagesets.push_back(linkageset);
         }
diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp
index 7f92652..9dbe5fc 100644
--- a/src/MuxElements.cpp
+++ b/src/MuxElements.cpp
@@ -662,53 +662,22 @@ unsigned short DabSubchannel::getSizeDWord() const
     return (bitrate * 3) >> 3;
 }
 
-LinkageSet::LinkageSet(string name, uint16_t lsn, bool hard, bool international) :
-    RemoteControllable(name)
+LinkageSet::LinkageSet(const std::string& name,
+        uint16_t lsn,
+        bool hard,
+        bool international) :
+    lsn(lsn),
+    active(true),
+    hard(hard),
+    international(international)
+{}
+
+
+LinkageSet LinkageSet::filter_type(const ServiceLinkType type)
 {
-    data.lsn = lsn;
-    data.active = false;
-    data.hard = hard;
-    data.international = international;
-    RC_ADD_PARAMETER(active, "Activate this linkage set [0 or 1]");
-}
-
-void LinkageSet::set_parameter(const string& parameter, const string& value)
-{
-    if (parameter == "active") {
-        stringstream ss;
-        ss << value;
-        ss >> data.active;
-    }
-    else {
-        stringstream ss;
-        ss << "Parameter '" << parameter <<
-            "' is not exported by controllable " << get_rc_name();
-        throw ParameterError(ss.str());
-    }
-}
-
-const string LinkageSet::get_parameter(const string& parameter) const
-{
-    stringstream ss;
-    if (parameter == "active") {
-        ss << data.active;
-    }
-    else {
-        ss << "Parameter '" << parameter <<
-            "' is not exported by controllable " << get_rc_name();
-        throw ParameterError(ss.str());
-    }
-    return ss.str();
-}
-
-LinkageSetData LinkageSetData::filter_type(ServiceLinkType type)
-{
-    LinkageSetData lsd;
+    LinkageSet lsd(m_name, lsn, hard, international);
 
-    lsd.lsn = lsn;
     lsd.active = active;
-    lsd.hard = hard;
-    lsd.international = international;
     lsd.keyservice = keyservice;
 
     for (const auto& link : id_list) {
diff --git a/src/MuxElements.h b/src/MuxElements.h
index 7ff23a6..968fb14 100644
--- a/src/MuxElements.h
+++ b/src/MuxElements.h
@@ -432,46 +432,40 @@ struct ServiceLink {
     uint8_t ecc;
 };
 
-/* Keep the data out of LinkageSet to make it copyable */
-struct LinkageSetData {
-    std::list<ServiceLink> id_list;
-
-    /* Linkage Set Number is a 12-bit number that identifies the linkage
-     * set in a country (requires coordination between multiplex operators
-     * in a country)
-     */
-    uint16_t lsn;
-
-    bool active; // Remote-controllable
-    bool hard;
-    bool international;
-
-    std::string keyservice; // TODO replace by pointer to service
-
-    /* Return a LinkageSetData with id_list filtered to include
-     * only those links of a given type
-     */
-    LinkageSetData filter_type(ServiceLinkType type);
-};
-
 /* Represents a linkage set linkage sets according to
  * TS 103 176 Clause 5.2.3 "Linkage sets". This information will
  * be encoded in FIG 0/6.
  */
-class LinkageSet : public RemoteControllable {
+class LinkageSet {
     public:
-        LinkageSet(std::string name, uint16_t lsn, bool hard, bool international);
+        LinkageSet(const std::string& name,
+                uint16_t lsn,
+                bool hard,
+                bool international);
 
-        LinkageSetData data;
+        std::string get_name(void) const { return m_name; }
 
-        bool is_active(void) const { return data.active; }
-    private:
-        /* Remote control */
-        virtual void set_parameter(const std::string& parameter,
-               const std::string& value);
+        std::list<ServiceLink> id_list;
 
-        /* Getting a parameter always returns a string. */
-        virtual const std::string get_parameter(const std::string& parameter) const;
+        /* Linkage Set Number is a 12-bit number that identifies the linkage
+         * set in a country (requires coordination between multiplex operators
+         * in a country)
+         */
+        uint16_t lsn;
+
+        bool active; // TODO: Remote-controllable
+        bool hard;
+        bool international;
+
+        std::string keyservice; // TODO replace by pointer to service
+
+        /* Return a LinkageSet with id_list filtered to include
+         * only those links of a given type
+         */
+        LinkageSet filter_type(const ServiceLinkType type);
+
+    private:
+        std::string m_name;
 };
 
 std::vector<DabSubchannel*>::iterator getSubchannel(
diff --git a/src/fig/FIG0_6.cpp b/src/fig/FIG0_6.cpp
index 411d47c..5174ec2 100644
--- a/src/fig/FIG0_6.cpp
+++ b/src/fig/FIG0_6.cpp
@@ -210,21 +210,21 @@ void FIG0_6::update()
     // TODO check if AMSS and DRM have to be put into a single subset
 
     for (const auto& linkageset : m_rti->ensemble->linkagesets) {
-        const auto lsn = linkageset->data.lsn;
+        const auto lsn = linkageset->lsn;
 
-        for (const auto& link : linkageset->data.id_list) {
+        for (const auto& link : linkageset->id_list) {
             const auto type = link.type;
 
             const auto subset =
                 std::find_if(linkageSubsets.begin(), linkageSubsets.end(),
-                    [&](const LinkageSetData& l) {
+                    [&](const LinkageSet& l) {
                         return not l.id_list.empty() and
                             l.lsn == lsn and l.id_list.front().type == type;
                     });
 
             if (subset == linkageSubsets.end()) {
                 // A subset with that LSN and type does not exist yet
-                linkageSubsets.push_back( linkageset->data.filter_type(type) );
+                linkageSubsets.push_back( linkageset->filter_type(type) );
             }
         }
     }
@@ -266,88 +266,5 @@ void FIG0_6::update()
 #endif
 }
 
-
-FIG0_6_CEI::FIG0_6_CEI(FIGRuntimeInformation *rti) :
-    m_rti(rti)
-{
-}
-
-FillStatus FIG0_6_CEI::fill(uint8_t *buf, size_t max_size)
-{
-    using namespace std;
-
-    auto ensemble = m_rti->ensemble;
-
-    // We are called every 24ms, and must timeout after 5s
-    const int timeout = 5000/24;
-
-    m_transition.update_state(timeout, ensemble->linkagesets);
-
-    FillStatus fs;
-    ssize_t remaining = max_size;
-
-    FIGtype0* fig0 = NULL;
-
-    // Combine all links into one list
-    set<LinkageSet*> alllinks;
-    for (const auto& l : m_transition.new_entries) {
-        alllinks.insert(l.first.get());
-    }
-    for (const auto& l : m_transition.repeated_entries) {
-        alllinks.insert(l.get());
-    }
-    for (const auto& l : m_transition.disabled_entries) {
-        alllinks.insert(l.first.get());
-    }
-
-    for (auto& link : alllinks) {
-        const bool PD = false;
-        const bool ILS = link->data.international;
-
-        // The CEI does not send list contents
-        const size_t num_ids = 0;
-
-        const size_t headersize = sizeof(struct FIGtype0_6_header);
-        const int required_size = sizeof(struct FIGtype0_6) + headersize +
-            (num_ids > 0 ?
-             (PD == 0 ? (ILS == 0 ? 2*num_ids : 3*num_ids) : 4*num_ids) :
-             0);
-
-        if (fig0 == NULL) {
-            if (remaining < 2 + required_size) {
-                break;
-            }
-            fig0 = (FIGtype0*)buf;
-            fig0->FIGtypeNumber = 0;
-            fig0->Length = 1;
-            fig0->CN = 1; // This is a CEI
-            fig0->OE = 0;
-            fig0->PD = PD;
-            fig0->Extension = 6;
-
-            buf += 2;
-            remaining -= 2;
-        }
-        else if (remaining < required_size) {
-            break;
-        }
-
-        FIGtype0_6 *fig0_6 = (FIGtype0_6*)buf;
-
-        fig0_6->IdListFlag = (num_ids > 0);
-        fig0_6->LA = link->data.active;
-        fig0_6->SH = link->data.hard;
-        fig0_6->ILS = ILS;
-        fig0_6->setLSN(link->data.lsn);
-
-        fig0->Length += sizeof(struct FIGtype0_6);
-        buf += sizeof(struct FIGtype0_6);
-        remaining -= sizeof(struct FIGtype0_6);
-    }
-
-    fs.complete_fig_transmitted = true;
-    return fs;
-}
-
 }
 
diff --git a/src/fig/FIG0_6.h b/src/fig/FIG0_6.h
index e970102..e7c81c5 100644
--- a/src/fig/FIG0_6.h
+++ b/src/fig/FIG0_6.h
@@ -30,10 +30,15 @@
 #include <memory>
 
 #include "fig/FIG0structs.h"
-#include "fig/TransitionHandler.h"
 
 namespace FIC {
 
+/* TODO
+ * This FIG code is unable to transmit the CEI to announce
+ * activation/deactivation of linkage sets.
+ * The TransitionHandler.h would be useful for that purpose
+ */
+
 // FIG type 0/6
 // Service Linking
 //
@@ -70,29 +75,8 @@ class FIG0_6 : public IFIG
          * We reorganise all LinkageSets into subsets that have
          * the same type.
          */
-        std::vector<LinkageSetData> linkageSubsets;
-        std::vector<LinkageSetData>::iterator linkageSetFIG0_6;
-};
-
-// FIG0/6 needs a change indicator, which is a short-form FIG (i.e. without the list)
-// and with C/N 1. Since this has another rate, it's implemented in another class.
-//
-// This is signalled once per second for a period of five seconds
-// (TS 103 176 5.2.4.3).
-class FIG0_6_CEI : public IFIG
-{
-    public:
-        FIG0_6_CEI(FIGRuntimeInformation* rti);
-        virtual FillStatus fill(uint8_t *buf, size_t max_size);
-        virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
-
-        virtual const int figtype(void) const { return 0; }
-        virtual const int figextension(void) const { return 6; }
-
-    private:
-        FIGRuntimeInformation *m_rti;
-
-        TransitionHandler<LinkageSet> m_transition;
+        std::vector<LinkageSet> linkageSubsets;
+        std::vector<LinkageSet>::iterator linkageSetFIG0_6;
 };
 
 }
diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp
index 2fc6718..ac2a80b 100644
--- a/src/fig/FIGCarousel.cpp
+++ b/src/fig/FIGCarousel.cpp
@@ -65,7 +65,6 @@ FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> ensemble) :
     m_fig0_3(&m_rti),
     m_fig0_5(&m_rti),
     m_fig0_6(&m_rti),
-    m_fig0_6_cei(&m_rti),
     m_fig0_17(&m_rti),
     m_fig0_8(&m_rti),
     m_fig1_0(&m_rti),
@@ -97,7 +96,6 @@ FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> ensemble) :
     load_and_allocate(m_fig0_3, FIBAllocation::FIB_ANY);
     load_and_allocate(m_fig0_5, FIBAllocation::FIB_ANY);
     load_and_allocate(m_fig0_6, FIBAllocation::FIB_ANY);
-    load_and_allocate(m_fig0_6_cei, FIBAllocation::FIB_ANY);
     load_and_allocate(m_fig0_8, FIBAllocation::FIB_ANY);
     load_and_allocate(m_fig0_13, FIBAllocation::FIB_ANY);
 
diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h
index 209fe19..f52f266 100644
--- a/src/fig/FIGCarousel.h
+++ b/src/fig/FIGCarousel.h
@@ -90,7 +90,6 @@ class FIGCarousel {
         FIG0_3 m_fig0_3;
         FIG0_5 m_fig0_5;
         FIG0_6 m_fig0_6;
-        FIG0_6_CEI m_fig0_6_cei;
         FIG0_17 m_fig0_17;
         FIG0_8 m_fig0_8;
         FIG1_0 m_fig1_0;
diff --git a/src/utils.cpp b/src/utils.cpp
index 4431407..4c08e8b 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -369,18 +369,17 @@ void printSubchannels(vector<DabSubchannel*>& subchannels)
 static void printLinking(const shared_ptr<dabEnsemble> ensemble)
 {
     etiLog.log(info, " Linkage Sets");
-    for (const auto& linkageset : ensemble->linkagesets) {
-        const auto& lsd = linkageset->data;
+    for (const auto& ls : ensemble->linkagesets) {
 
-        etiLog.level(info) << "  set " << linkageset->get_rc_name();
-        etiLog.log(info,      "   LSN 0x%04x", lsd.lsn);
-        etiLog.level(info) << "   active " << (lsd.active ? "true" : "false");
-        etiLog.level(info) << "   " << (lsd.hard ? "hard" : "soft");
-        etiLog.level(info) << "   international " << (lsd.international ? "true" : "false");
-        etiLog.level(info) << "   key service " << lsd.keyservice;
+        etiLog.level(info) << "  set " << ls->get_name();
+        etiLog.log(info,      "   LSN 0x%04x", ls->lsn);
+        etiLog.level(info) << "   active " << (ls->active ? "true" : "false");
+        etiLog.level(info) << "   " << (ls->hard ? "hard" : "soft");
+        etiLog.level(info) << "   international " << (ls->international ? "true" : "false");
+        etiLog.level(info) << "   key service " << ls->keyservice;
 
         etiLog.level(info) << "   ID list";
-        for (const auto& link : lsd.id_list) {
+        for (const auto& link : ls->id_list) {
             switch (link.type) {
                 case ServiceLinkType::DAB:
                     etiLog.level(info) << "    type DAB";
@@ -396,7 +395,7 @@ static void printLinking(const shared_ptr<dabEnsemble> ensemble)
                     break;
             }
             etiLog.log(info,      "    id 0x%04x", link.id);
-            if (lsd.international) {
+            if (ls->international) {
                 etiLog.log(info,      "    ecc 0x%04x", link.ecc);
             }
         }