From 27c6111ebf2e94af6e93c35879efd310861bb08e Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 23 Sep 2016 16:50:31 +0200 Subject: Add warning about primary component labels --- src/ConfigParser.cpp | 6 ++++++ src/fig/FIG1.cpp | 3 +++ 2 files changed, 9 insertions(+) (limited to 'src') diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index 733b5df..6a359b7 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -507,6 +507,12 @@ void parse_ptree(boost::property_tree::ptree& pt, abort(); } + if (component->SCIdS == 0 and not component->label.long_label().empty()) { + etiLog.level(warn) << "Primary component " << component->uid << + " has label set. Since V2.1.1 of the specification, only secondary" + " components are allowed to have labels."; + } + if (figType != -1) { if (figType >= (1<<12)) { stringstream ss; diff --git a/src/fig/FIG1.cpp b/src/fig/FIG1.cpp index 86c717e..8f41239 100644 --- a/src/fig/FIG1.cpp +++ b/src/fig/FIG1.cpp @@ -145,6 +145,9 @@ FillStatus FIG1_4::fill(uint8_t *buf, size_t max_size) auto service = getService(*component, ensemble->services); + /* We check in the config parser if the primary component has + * a label, which is forbidden since V2.1.1 */ + if (not (*component)->label.long_label().empty() ) { if ((*service)->getType(ensemble) == subchannel_type_t::Audio) { -- cgit v1.2.3