diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-21 14:30:09 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-19 10:43:35 +0200 |
| commit | 76e7f0f79c908bf7d0a447ea643dbcdde8f064d2 (patch) | |
| tree | 214230901ec43d923e1696c54005a123278df086 /src/ConfigParser.h | |
| parent | 0ac177534620caa13864f9bfcd804004e3e538fd (diff) | |
| download | dabmux-76e7f0f79c908bf7d0a447ea643dbcdde8f064d2.tar.gz dabmux-76e7f0f79c908bf7d0a447ea643dbcdde8f064d2.tar.bz2 dabmux-76e7f0f79c908bf7d0a447ea643dbcdde8f064d2.zip | |
Start big refactoring
Multiplexer in separate object
Replace pointers by shared_ptr
Switch to C++11
Diffstat (limited to 'src/ConfigParser.h')
| -rw-r--r-- | src/ConfigParser.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 4af010a..e2dc6ce 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -36,23 +36,18 @@ #include "MuxElements.h" #include "DabMux.h" #include <boost/property_tree/ptree.hpp> +#include <boost/shared_ptr.hpp> void parse_ptree(boost::property_tree::ptree& pt, - std::vector<dabOutput*> &outputs, - dabEnsemble* ensemble, - bool* enableTist, - unsigned* FICL, - bool* factumAnalyzer, - unsigned long* limit, - BaseRemoteController** rc, - int* mgmtserverport, + boost::shared_ptr<dabEnsemble> ensemble, + boost::shared_ptr<BaseRemoteController> rc, edi_configuration_t* edi); void setup_subchannel_from_ptree(dabSubchannel* subchan, boost::property_tree::ptree &pt, - dabEnsemble* ensemble, + boost::shared_ptr<dabEnsemble> ensemble, std::string subchanuid, - BaseRemoteController* rc); + boost::shared_ptr<BaseRemoteController> rc); #endif |