1 files changed, 26 insertions, 32 deletions
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(