aboutsummaryrefslogtreecommitdiffstats
path: root/src/DabMultiplexer.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-06-21 21:56:59 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-06-21 22:10:44 +0200
commit1328d62f9d3a2eb9f089d531614302005c29ec37 (patch)
tree17c179b21813f3dbea0d83535d0523dd411908f8 /src/DabMultiplexer.h
parent711f52b5a1f114ae911d0e072498c81831c0b814 (diff)
downloaddabmux-1328d62f9d3a2eb9f089d531614302005c29ec37.tar.gz
dabmux-1328d62f9d3a2eb9f089d531614302005c29ec37.tar.bz2
dabmux-1328d62f9d3a2eb9f089d531614302005c29ec37.zip
Replace MGMT socket by ZMQ, make services shared_ptr
Diffstat (limited to 'src/DabMultiplexer.h')
-rw-r--r--src/DabMultiplexer.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h
index ebedc82..e9843fc 100644
--- a/src/DabMultiplexer.h
+++ b/src/DabMultiplexer.h
@@ -46,6 +46,7 @@
#include "Eti.h"
#include <exception>
#include <vector>
+#include <memory>
#include <string>
#include <boost/shared_ptr.hpp>
#include <boost/property_tree/ptree.hpp>
@@ -74,6 +75,8 @@ class DabMultiplexer {
void print_info(void);
+ void update_config(boost::property_tree::ptree pt);
+
private:
void prepare_watermark(void);
void prepare_subchannels(void);
@@ -101,9 +104,9 @@ class DabMultiplexer {
unsigned int insertFIG;
unsigned int rotateFIB;
- std::vector<DabService*>::iterator serviceProgFIG0_2;
- std::vector<DabService*>::iterator serviceDataFIG0_2;
- std::vector<DabService*>::iterator serviceFIG0_17;
+ std::vector<std::shared_ptr<DabService> >::iterator serviceProgFIG0_2;
+ std::vector<std::shared_ptr<DabService> >::iterator serviceDataFIG0_2;
+ std::vector<std::shared_ptr<DabService> >::iterator serviceFIG0_17;
std::vector<DabComponent*>::iterator componentProgFIG0_8;
std::vector<DabComponent*>::iterator componentDataFIG0_8;