From 07d3536083ad8d0f08819e8be89aa5934fcaa712 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 15 Apr 2016 11:10:00 +0200 Subject: Rename dabSubchannel to DabSubchannel --- src/ConfigParser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ConfigParser.cpp') diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index 8795277..b6d1482 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -385,12 +385,12 @@ void parse_ptree(boost::property_tree::ptree& pt, /******************** READ SUBCHAN PARAMETERS **************/ - map allsubchans; + map allsubchans; ptree pt_subchans = pt.get_child("subchannels"); for (ptree::iterator it = pt_subchans.begin(); it != pt_subchans.end(); ++it) { string subchanuid = it->first; - dabSubchannel* subchan = new dabSubchannel(subchanuid); + DabSubchannel* subchan = new DabSubchannel(subchanuid); ensemble->subchannels.push_back(subchan); @@ -441,7 +441,7 @@ void parse_ptree(boost::property_tree::ptree& pt, throw runtime_error(ss.str()); } - dabSubchannel* subchannel; + DabSubchannel* subchannel; try { string subchan_uid = pt_comp.get("subchannel"); if (allsubchans.count(subchan_uid) != 1) { @@ -553,7 +553,7 @@ void parse_ptree(boost::property_tree::ptree& pt, } -void setup_subchannel_from_ptree(dabSubchannel* subchan, +void setup_subchannel_from_ptree(DabSubchannel* subchan, boost::property_tree::ptree &pt, std::shared_ptr ensemble, string subchanuid, @@ -909,7 +909,7 @@ void setup_subchannel_from_ptree(dabSubchannel* subchan, } catch (ptree_error &e) { for (int i = 0; i < 64; ++i) { // Find first free subchannel - vector::iterator subchannel = getSubchannel(ensemble->subchannels, i); + vector::iterator subchannel = getSubchannel(ensemble->subchannels, i); if (subchannel == ensemble->subchannels.end()) { subchannel = ensemble->subchannels.end() - 1; subchan->id = i; -- cgit v1.2.3