summaryrefslogtreecommitdiffstats
path: root/src/MuxElements.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-02-13 09:29:47 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-02-13 09:29:47 +0100
commit8594e81beadc395b3fc2568dc29b48712acb2561 (patch)
treeb22d00fc01aa81a095b0664b3b947781a1064a49 /src/MuxElements.h
parentc4833640f8dddbe556cc6d40211223a05d5270b8 (diff)
parent7eb97a486a8a39ef3986b9c2c7c452e9ccf2693a (diff)
downloaddabmux-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/MuxElements.h')
-rw-r--r--src/MuxElements.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/MuxElements.h b/src/MuxElements.h
index 635f55f..b2be73f 100644
--- a/src/MuxElements.h
+++ b/src/MuxElements.h
@@ -58,10 +58,11 @@ class MuxInitException : public std::exception
enum class subchannel_type_t {
- Audio = 0,
- DataDmb = 1,
- Fidc = 2,
- Packet = 3
+ DABAudio = 0,
+ DABPlusAudio = 1,
+ DataDmb = 2,
+ Fidc = 3,
+ Packet = 4
};
@@ -336,7 +337,7 @@ public:
std::string inputUri;
std::shared_ptr<Inputs::InputBase> input;
unsigned char id = 0;
- subchannel_type_t type = subchannel_type_t::Audio;
+ subchannel_type_t type = subchannel_type_t::DABAudio;
uint16_t startAddress = 0;
uint16_t bitrate = 0;
struct dabProtection protection;