summaryrefslogtreecommitdiffstats
path: root/src/ConfigParser.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-07 16:35:15 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-07 16:35:15 +0200
commit17623dd6b6d800e15b3a27de4d14fd1a3a160b1b (patch)
tree9a34766f1bda012f06bf18abcea687c8a4741dd1 /src/ConfigParser.cpp
parenta951ea2f636360f724ef35e8aabd859e46d42290 (diff)
parent17e6a246149c11bac667a233fff1a33a1d06a1fb (diff)
downloaddabmux-17623dd6b6d800e15b3a27de4d14fd1a3a160b1b.tar.gz
dabmux-17623dd6b6d800e15b3a27de4d14fd1a3a160b1b.tar.bz2
dabmux-17623dd6b6d800e15b3a27de4d14fd1a3a160b1b.zip
Merge 'next' into servicelinking
Diffstat (limited to 'src/ConfigParser.cpp')
-rw-r--r--src/ConfigParser.cpp26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index cb458d7..1876697 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -143,10 +143,8 @@ uint16_t get_announcement_flag_from_ptree(
}
// Parse the linkage section
-void parse_linkage(boost::property_tree::ptree& pt,
- std::shared_ptr<dabEnsemble> ensemble,
- std::shared_ptr<BaseRemoteController> rc
- )
+static void parse_linkage(boost::property_tree::ptree& pt,
+ std::shared_ptr<dabEnsemble> ensemble)
{
using boost::property_tree::ptree;
using boost::property_tree::ptree_error;
@@ -230,10 +228,9 @@ void parse_linkage(boost::property_tree::ptree& pt,
}
}
-void parse_ptree(boost::property_tree::ptree& pt,
- std::shared_ptr<dabEnsemble> ensemble,
- std::shared_ptr<BaseRemoteController> rc
- )
+void parse_ptree(
+ boost::property_tree::ptree& pt,
+ std::shared_ptr<dabEnsemble> ensemble)
{
using boost::property_tree::ptree;
using boost::property_tree::ptree_error;
@@ -335,7 +332,7 @@ void parse_ptree(boost::property_tree::ptree& pt,
pt_announcement.get_child("flags"));
cl->subchanneluid = pt_announcement.get<string>("subchannel");
- cl->enrol_at(*rc);
+ rcs.enrol(cl.get());
ensemble->clusters.push_back(cl);
}
}
@@ -483,7 +480,7 @@ void parse_ptree(boost::property_tree::ptree& pt,
try {
setup_subchannel_from_ptree(subchan, it->second, ensemble,
- subchanuid, rc);
+ subchanuid);
}
catch (runtime_error &e) {
etiLog.log(error,
@@ -644,14 +641,13 @@ void parse_ptree(boost::property_tree::ptree& pt,
}
- parse_linkage(pt, ensemble, rc);
+ parse_linkage(pt, ensemble);
}
void setup_subchannel_from_ptree(DabSubchannel* subchan,
boost::property_tree::ptree &pt,
std::shared_ptr<dabEnsemble> ensemble,
- string subchanuid,
- std::shared_ptr<BaseRemoteController> rc)
+ string subchanuid)
{
using boost::property_tree::ptree;
using boost::property_tree::ptree_error;
@@ -746,7 +742,7 @@ void setup_subchannel_from_ptree(DabSubchannel* subchan,
DabInputZmqMPEG* inzmq =
new DabInputZmqMPEG(subchanuid, zmqconfig);
- inzmq->enrol_at(*rc);
+ rcs.enrol(inzmq);
subchan->input = inzmq;
if (proto == "epmg") {
@@ -812,7 +808,7 @@ void setup_subchannel_from_ptree(DabSubchannel* subchan,
DabInputZmqAAC* inzmq =
new DabInputZmqAAC(subchanuid, zmqconfig);
- inzmq->enrol_at(*rc);
+ rcs.enrol(inzmq);
subchan->input = inzmq;
if (proto == "epmg") {