diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-09-30 11:39:53 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-09-30 11:39:53 +0200 |
| commit | 35ae5602e9c72077cf9439c2806ad9a625ee6079 (patch) | |
| tree | fbd4fe9fce027af3774aa72157de4fd636d179d6 | |
| parent | 9db03b9e567ca4c716aedd017013069a54f0d66f (diff) | |
| download | dabmux-35ae5602e9c72077cf9439c2806ad9a625ee6079.tar.gz dabmux-35ae5602e9c72077cf9439c2806ad9a625ee6079.tar.bz2 dabmux-35ae5602e9c72077cf9439c2806ad9a625ee6079.zip | |
Clarify how to declare several linking sets
| -rw-r--r-- | doc/servicelinking.mux | 6 | ||||
| -rw-r--r-- | src/MuxElements.cpp | 17 | ||||
| -rw-r--r-- | src/MuxElements.h | 2 |
3 files changed, 6 insertions, 19 deletions
diff --git a/doc/servicelinking.mux b/doc/servicelinking.mux index da3a86a..76ac3e5 100644 --- a/doc/servicelinking.mux +++ b/doc/servicelinking.mux @@ -18,12 +18,12 @@ remotecontrol { telnetport 12721 } -; Service linking settings +; Service linking sets linking { - ; The sets section declares the linkage sets according to + ; Every child section declares one linkage sets according to ; TS 103 176 Clause 5.2.3 "Linkage sets". This information will ; be encoded in FIG 0/6 - sets { + set-fu { ; Linkage Set Number is a 12-bit number that identifies the linkage set ; in a country (requires coordination between multiplex operators in a country) lsn 0xabc 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 |