diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-02-13 09:29:47 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-02-13 09:29:47 +0100 |
| commit | 8594e81beadc395b3fc2568dc29b48712acb2561 (patch) | |
| tree | b22d00fc01aa81a095b0664b3b947781a1064a49 /src/fig/FIG2.cpp | |
| parent | c4833640f8dddbe556cc6d40211223a05d5270b8 (diff) | |
| parent | 7eb97a486a8a39ef3986b9c2c7c452e9ccf2693a (diff) | |
| download | dabmux-8594e81beadc395b3fc2568dc29b48712acb2561.tar.gz dabmux-8594e81beadc395b3fc2568dc29b48712acb2561.tar.bz2 dabmux-8594e81beadc395b3fc2568dc29b48712acb2561.zip | |
Merge KuntzeM's pull request fixing #35 into next
ETI with DAB (MUSICAM) and EEP_A protection level was not possible.
Diffstat (limited to 'src/fig/FIG2.cpp')
| -rw-r--r-- | src/fig/FIG2.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fig/FIG2.cpp b/src/fig/FIG2.cpp index fefde6e..afa64eb 100644 --- a/src/fig/FIG2.cpp +++ b/src/fig/FIG2.cpp @@ -202,7 +202,8 @@ FillStatus FIG2_1_and_5::fill(uint8_t *buf, size_t max_size) // Rotate through the subchannels until there is no more space while (service != ensemble->services.end()) { - const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::Audio; + const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::DABAudio or + ((*service)->getType(ensemble) == subchannel_type_t::DABPlusAudio); if (not (m_programme xor is_programme) and (*service)->label.has_fig2_label()) { @@ -315,7 +316,8 @@ FillStatus FIG2_4::fill(uint8_t *buf, size_t max_size) } } - const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::Audio; + const bool is_programme = (*service)->getType(ensemble) == subchannel_type_t::DABAudio or + ((*service)->getType(ensemble) == subchannel_type_t::DABPlusAudio); const size_t id_length = is_programme ? sizeof(FIGtype2_4_Programme_Identifier) : |