summaryrefslogtreecommitdiffstats
path: root/src/MuxElements.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-28 20:08:56 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-28 20:08:56 +0100
commit6800fb66282525542366bc58df3095b93e3bf8ca (patch)
treec6e7607b5090ceff1e69a1f0fff206b1a7a9c07b /src/MuxElements.h
parent96b4dc4efca1b164f79a7f7394449866f034ac31 (diff)
downloaddabmux-6800fb66282525542366bc58df3095b93e3bf8ca.tar.gz
dabmux-6800fb66282525542366bc58df3095b93e3bf8ca.tar.bz2
dabmux-6800fb66282525542366bc58df3095b93e3bf8ca.zip
Remove service linking active from RC
This can be added later if the need arises, and when proper testing validates the implementation.
Diffstat (limited to 'src/MuxElements.h')
-rw-r--r--src/MuxElements.h58
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(