diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-07 16:35:15 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-07 16:35:15 +0200 |
commit | 17623dd6b6d800e15b3a27de4d14fd1a3a160b1b (patch) | |
tree | 9a34766f1bda012f06bf18abcea687c8a4741dd1 /src/DabMultiplexer.h | |
parent | a951ea2f636360f724ef35e8aabd859e46d42290 (diff) | |
parent | 17e6a246149c11bac667a233fff1a33a1d06a1fb (diff) | |
download | dabmux-17623dd6b6d800e15b3a27de4d14fd1a3a160b1b.tar.gz dabmux-17623dd6b6d800e15b3a27de4d14fd1a3a160b1b.tar.bz2 dabmux-17623dd6b6d800e15b3a27de4d14fd1a3a160b1b.zip |
Merge 'next' into servicelinking
Diffstat (limited to 'src/DabMultiplexer.h')
-rw-r--r-- | src/DabMultiplexer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h index e069da5..0d008be 100644 --- a/src/DabMultiplexer.h +++ b/src/DabMultiplexer.h @@ -55,7 +55,6 @@ class DabMultiplexer : public RemoteControllable { public: DabMultiplexer( - std::shared_ptr<BaseRemoteController> rc, boost::property_tree::ptree pt); void prepare(void); @@ -80,7 +79,6 @@ class DabMultiplexer : public RemoteControllable { void prepare_data_inputs(void); boost::property_tree::ptree m_pt; - std::shared_ptr<BaseRemoteController> m_rc; unsigned timestamp; bool MNSC_increment_time; |