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/FIG0_24.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/FIG0_24.cpp')
-rw-r--r-- | src/fig/FIG0_24.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fig/FIG0_24.cpp b/src/fig/FIG0_24.cpp index 1441df2..960d261 100644 --- a/src/fig/FIG0_24.cpp +++ b/src/fig/FIG0_24.cpp @@ -93,7 +93,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size) } } - subchannel_type_t type = subchannel_type_t::Audio; + subchannel_type_t type = subchannel_type_t::DABAudio; bool isProgramme = true; bool oe = true; @@ -107,7 +107,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size) oe, serviceFIG0_24->service_id, m_inserting_audio_not_data ? "AUDIO" : "DATA", - type == subchannel_type_t::Audio ? "Audio" : + type == subchannel_type_t::DABAudio ? "Audio" : type == subchannel_type_t::Packet ? "Packet" : type == subchannel_type_t::DataDmb ? "DataDmb" : type == subchannel_type_t::Fidc ? "Fidc" : "?"); @@ -147,7 +147,7 @@ FillStatus FIG0_24::fill(uint8_t *buf, size_t max_size) break; } - if (type == subchannel_type_t::Audio) { + if (type == subchannel_type_t::DABAudio) { auto fig0_2serviceAudio = (FIGtype0_24_audioservice*)buf; fig0_2serviceAudio->SId = htons(serviceFIG0_24->service_id); |