diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-03-01 17:31:59 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-03-01 17:31:59 +0100 |
| commit | 11fc926de4f80d73effc779e2645d6cc778e6568 (patch) | |
| tree | aa69b16d96f9d4b8c58d60beddbc3bf4ec6e917e | |
| parent | eb91bc3b5c8079e8e9486dba342d5d123ac483e0 (diff) | |
| download | dabmux-11fc926de4f80d73effc779e2645d6cc778e6568.tar.gz dabmux-11fc926de4f80d73effc779e2645d6cc778e6568.tar.bz2 dabmux-11fc926de4f80d73effc779e2645d6cc778e6568.zip | |
Remove support for other_ensembles in services
| -rw-r--r-- | src/ConfigParser.cpp | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index d6bd553..e9fe91d 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -595,41 +595,12 @@ void parse_ptree( } service->language = hexparse(pt_service.get("language", "0")); - try { - auto oelist = pt_service.get<std::string>("other_ensembles", ""); - - if (not oelist.empty()) { - etiLog.level(warn) << - "You are using the deprecated other_ensembles inside " - "'services' specification. Please see doc/servicelinking.mux " - "for the new syntax."; - - vector<string> oe_string_list; - boost::split(oe_string_list, oelist, boost::is_any_of(",")); - - ServiceOtherEnsembleInfo oe_info; - oe_info.service_id = service->id; - - for (const auto& oe_string : oe_string_list) { - if (oe_string == "") { - continue; - } - try { - oe_info.other_ensembles.push_back(hexparse(oe_string)); - } - catch (const std::exception& e) { - etiLog.level(warn) << "Cannot parse '" << oelist << - "' other_ensembles for service " << serviceuid << - ": " << e.what(); - } - } - - ensemble->service_other_ensemble.push_back(move(oe_info)); - } - } - catch (const ptree_error& e) { - etiLog.level(info) << "No other_ensembles information for Service " << - serviceuid; + auto oelist = pt_service.get<std::string>("other_ensembles", ""); + if (not oelist.empty()) { + throw runtime_error( + "You are using the deprecated other_ensembles inside " + "'services' specification. Please see doc/servicelinking.mux " + "for the new syntax."); } allservices[serviceuid] = service; |