From 53e25831c29615132ba3ee5d1d24dc14c45c20aa Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 18 Dec 2015 11:54:10 +0100 Subject: EDI: Simplify subchannel handling --- src/dabOutput/edi/TagItems.cpp | 2 +- src/dabOutput/edi/TagItems.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/dabOutput/edi') diff --git a/src/dabOutput/edi/TagItems.cpp b/src/dabOutput/edi/TagItems.cpp index f29eaeb..afc45a8 100644 --- a/src/dabOutput/edi/TagItems.cpp +++ b/src/dabOutput/edi/TagItems.cpp @@ -137,7 +137,7 @@ std::vector TagESTn::Assemble() std::vector packet(pack_data.begin(), pack_data.end()); packet.reserve(mst_length*8 + 16); - packet.push_back(id_); + packet.push_back(id); // Placeholder for length packet.push_back(0); diff --git a/src/dabOutput/edi/TagItems.h b/src/dabOutput/edi/TagItems.h index e75d241..af5e7df 100644 --- a/src/dabOutput/edi/TagItems.h +++ b/src/dabOutput/edi/TagItems.h @@ -94,8 +94,6 @@ class TagDETI : public TagItem class TagESTn : public TagItem { public: - TagESTn(uint8_t id) : id_(id) {} ; - std::vector Assemble(); // SSTCn @@ -108,8 +106,7 @@ class TagESTn : public TagItem uint8_t* mst_data; size_t mst_length; // STLn * 8 bytes - private: - uint8_t id_; + uint8_t id; }; // ETSI TS 102 821, 5.2.2.2 Dummy padding -- cgit v1.2.3