From 1328d62f9d3a2eb9f089d531614302005c29ec37 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 21 Jun 2015 21:56:59 +0200
Subject: Replace MGMT socket by ZMQ, make services shared_ptr

---
 src/DabMultiplexer.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/DabMultiplexer.cpp')

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;
 
-- 
cgit v1.2.3