diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-02-28 11:06:56 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-02-28 17:49:36 +0100 |
commit | 8d01f90791b1dfd152f91a021422d4d2c2f1be46 (patch) | |
tree | 8ed373848955925771b60d65e36ebf0be8932008 /src/fig/FIG0.h | |
parent | aa5ad55fdb730c96919cc3ff265d1f72af29c16f (diff) | |
download | dabmux-8d01f90791b1dfd152f91a021422d4d2c2f1be46.tar.gz dabmux-8d01f90791b1dfd152f91a021422d4d2c2f1be46.tar.bz2 dabmux-8d01f90791b1dfd152f91a021422d4d2c2f1be46.zip |
Move watermark to FIG0/1 in new carousel
Diffstat (limited to 'src/fig/FIG0.h')
-rw-r--r-- | src/fig/FIG0.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fig/FIG0.h b/src/fig/FIG0.h index 87872eb..927a7f5 100644 --- a/src/fig/FIG0.h +++ b/src/fig/FIG0.h @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2015 + Copyright (C) 2015, 2016 Matthias P. Braendli, matthias.braendli@mpb.li */ /* @@ -66,7 +66,12 @@ class FIG0_1 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; + std::vector<dabSubchannel*> subchannels; std::vector<dabSubchannel*>::iterator subchannelFIG0_1; + + uint8_t m_watermarkData[128]; + size_t m_watermarkSize; + size_t m_watermarkPos; }; // FIG type 0/2, MCI, Service Organization, one instance of @@ -159,10 +164,6 @@ class FIG0_10 : public IFIG private: FIGRuntimeInformation *m_rti; - - uint8_t m_watermarkData[128]; - size_t m_watermarkSize; - size_t m_watermarkPos; }; // FIG type 0/13 |