diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-12 16:30:30 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-12 16:30:30 +0100 |
| commit | 96b4dc4efca1b164f79a7f7394449866f034ac31 (patch) | |
| tree | 101b796f40fee444c8193ccc3e13cf5644c83d5f /src/MuxElements.h | |
| parent | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (diff) | |
| parent | fedab89cd4625617b3e481f1f59ba0fc97b7305b (diff) | |
| download | dabmux-96b4dc4efca1b164f79a7f7394449866f034ac31.tar.gz dabmux-96b4dc4efca1b164f79a7f7394449866f034ac31.tar.bz2 dabmux-96b4dc4efca1b164f79a7f7394449866f034ac31.zip | |
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/MuxElements.h')
| -rw-r--r-- | src/MuxElements.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MuxElements.h b/src/MuxElements.h index 79100a9..7ff23a6 100644 --- a/src/MuxElements.h +++ b/src/MuxElements.h @@ -40,7 +40,7 @@ #include <boost/optional.hpp> #include <stdint.h> #include "dabOutput/dabOutput.h" -#include "dabInput.h" +#include "input/inputs.h" #include "RemoteControl.h" #include "Eti.h" @@ -297,7 +297,7 @@ public: std::string uid; std::string inputUri; - DabInputBase* input; + std::shared_ptr<Inputs::InputBase> input; unsigned char id; subchannel_type_t type; uint16_t startAddress; |