diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-07 21:37:47 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-07 21:37:47 +0100 |
| commit | 95b197a53c8314a68fd8cf73e495018844e7d708 (patch) | |
| tree | d7a1f48c0c7f04bea34c9e19dc219195469df563 /src/DabMux.cpp | |
| parent | 33e51f5996c02c6a6aee27b57d91d90e3f1db5a2 (diff) | |
| parent | 21d8cacffc1201514b0e1143f8de60e754262291 (diff) | |
| download | dabmux-95b197a53c8314a68fd8cf73e495018844e7d708.tar.gz dabmux-95b197a53c8314a68fd8cf73e495018844e7d708.tar.bz2 dabmux-95b197a53c8314a68fd8cf73e495018844e7d708.zip | |
Merge rework of inputs into 'next'
This breaks the non-blocking fifo inputs, as it seems nobody is
using them.
It restores some UDP functionality, not necessarily in the same way as
before.
Diffstat (limited to 'src/DabMux.cpp')
| -rw-r--r-- | src/DabMux.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/DabMux.cpp b/src/DabMux.cpp index 32ddb39..3927420 100644 --- a/src/DabMux.cpp +++ b/src/DabMux.cpp @@ -94,22 +94,8 @@ typedef DWORD32 uint32_t; # include "Eti.h" #endif -#include "dabInputFile.h" -#include "dabInputFifo.h" -#include "dabInputMpegFile.h" -#include "dabInputMpegFifo.h" -#include "dabInputDabplusFile.h" -#include "dabInputDabplusFifo.h" -#include "dabInputPacketFile.h" -#include "dabInputEnhancedPacketFile.h" -#include "dabInputEnhancedFifo.h" -#include "dabInputUdp.h" -#include "dabInputPrbs.h" -#include "dabInputRawFile.h" -#include "dabInputRawFifo.h" -#include "dabInputDmbFile.h" -#include "dabInputDmbUdp.h" - +#include "input/Prbs.h" +#include "input/Zmq.h" #include "dabOutput/dabOutput.h" #include "dabOutput/edi/TagItems.h" |