summaryrefslogtreecommitdiffstats
path: root/src/dabOutput
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-12-18 11:54:10 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-12-18 11:54:10 +0100
commit53e25831c29615132ba3ee5d1d24dc14c45c20aa (patch)
treee72cd73f2b90748495e7fc1d3cbca88a5bc77ab3 /src/dabOutput
parenta8c51a1bbc1493730567ef1c0367cccce34035eb (diff)
downloaddabmux-53e25831c29615132ba3ee5d1d24dc14c45c20aa.tar.gz
dabmux-53e25831c29615132ba3ee5d1d24dc14c45c20aa.tar.bz2
dabmux-53e25831c29615132ba3ee5d1d24dc14c45c20aa.zip
EDI: Simplify subchannel handling
Diffstat (limited to 'src/dabOutput')
-rw-r--r--src/dabOutput/edi/TagItems.cpp2
-rw-r--r--src/dabOutput/edi/TagItems.h5
2 files changed, 2 insertions, 5 deletions
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<uint8_t> TagESTn::Assemble()
std::vector<uint8_t> 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<uint8_t> 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