From 35ae5602e9c72077cf9439c2806ad9a625ee6079 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 30 Sep 2016 11:39:53 +0200 Subject: Clarify how to declare several linking sets --- src/MuxElements.cpp | 17 ++--------------- src/MuxElements.h | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp index b2f8bca..ad623b9 100644 --- a/src/MuxElements.cpp +++ b/src/MuxElements.cpp @@ -662,21 +662,8 @@ unsigned short DabSubchannel::getSizeDWord(void) const return (bitrate * 3) >> 3; } -static string lsn_to_rc_name(uint16_t lsn) -{ - std::stringstream ss; - ss << "linkset" << - std::uppercase << - std::setfill('0') << - std::setw(4) << - std::hex << - lsn; - - return ss.str(); -} - -LinkageSet::LinkageSet(uint16_t lsn, bool hard, bool international) : - RemoteControllable(lsn_to_rc_name(lsn)), +LinkageSet::LinkageSet(string name, uint16_t lsn, bool hard, bool international) : + RemoteControllable(name), m_lsn(lsn), m_active(false), m_hard(hard), diff --git a/src/MuxElements.h b/src/MuxElements.h index 47de4e3..ab97fd7 100644 --- a/src/MuxElements.h +++ b/src/MuxElements.h @@ -438,7 +438,7 @@ struct ServiceLink { */ class LinkageSet : public RemoteControllable { public: - LinkageSet(uint16_t lsn, bool hard, bool international); + LinkageSet(string name, uint16_t lsn, bool hard, bool international); private: /* Linkage Set Number is a 12-bit number that identifies the linkage -- cgit v1.2.3