diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-21 21:56:59 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-21 22:10:44 +0200 |
| commit | 1328d62f9d3a2eb9f089d531614302005c29ec37 (patch) | |
| tree | 17c179b21813f3dbea0d83535d0523dd411908f8 /src/DabMultiplexer.cpp | |
| parent | 711f52b5a1f114ae911d0e072498c81831c0b814 (diff) | |
| download | dabmux-1328d62f9d3a2eb9f089d531614302005c29ec37.tar.gz dabmux-1328d62f9d3a2eb9f089d531614302005c29ec37.tar.bz2 dabmux-1328d62f9d3a2eb9f089d531614302005c29ec37.zip | |
Replace MGMT socket by ZMQ, make services shared_ptr
Diffstat (limited to 'src/DabMultiplexer.cpp')
| -rw-r--r-- | src/DabMultiplexer.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index 55de493..413e034 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -116,6 +116,17 @@ void DabMultiplexer::prepare_watermark() m_watermarkPos = 0; } +void DabMultiplexer::update_config(boost::property_tree::ptree pt) +{ + ensemble->services.clear(); + ensemble->components.clear(); + ensemble->subchannels.clear(); + + m_pt = pt; + + prepare(); +} + // Run a set of checks on the configuration void DabMultiplexer::prepare() { @@ -369,7 +380,7 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu unsigned char etiFrame[6144]; unsigned short index = 0; - vector<DabService*>::iterator service; + vector<std::shared_ptr<DabService> >::iterator service; vector<DabComponent*>::iterator component; vector<dabSubchannel*>::iterator subchannel; |