diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-02-14 15:46:54 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-02-14 15:46:54 +0100 |
commit | d6923be4bd2e198b4cba161e8040072128bd392c (patch) | |
tree | cf3e74d4685075b4836141c48a71507666074781 /src/ParserConfigfile.cpp | |
parent | 77d77e5f4d60ed9d1f8346910f42fe2d61122f22 (diff) | |
download | dabmux-d6923be4bd2e198b4cba161e8040072128bd392c.tar.gz dabmux-d6923be4bd2e198b4cba161e8040072128bd392c.tar.bz2 dabmux-d6923be4bd2e198b4cba161e8040072128bd392c.zip |
make DabComponent a class and make its label RC controllable
Diffstat (limited to 'src/ParserConfigfile.cpp')
-rw-r--r-- | src/ParserConfigfile.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ParserConfigfile.cpp b/src/ParserConfigfile.cpp index a6bbe63..d5dba9e 100644 --- a/src/ParserConfigfile.cpp +++ b/src/ParserConfigfile.cpp @@ -333,7 +333,7 @@ void parse_configfile(string configuration_file, } /******************** READ COMPONENT PARAMETERS ************/ - map<string, dabComponent*> allcomponents; + map<string, DabComponent*> allcomponents; ptree pt_components = pt.get_child("components"); for (ptree::iterator it = pt_components.begin(); it != pt_components.end(); ++it) { string componentuid = it->first; @@ -378,9 +378,8 @@ void parse_configfile(string configuration_file, int packet_address = hexparse(pt_comp.get("address", "-1")); uint8_t component_type = hexparse(pt_comp.get("type", "0")); - dabComponent* component = new dabComponent(); + DabComponent* component = new DabComponent(componentuid); - memset(component, 0, sizeof(dabComponent)); component->serviceId = service->id; component->subchId = subchannel->id; component->SCIdS = SCIdS_per_service[service]++; |