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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 408c86e..084cf7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,23 +47,11 @@ odr_dabmux_LDADD =$(ZMQ_LIBS) $(CURL_LIBS) \ odr_dabmux_SOURCES =DabMux.cpp DabMux.h \ DabMultiplexer.cpp DabMultiplexer.h \ - dabInput.h dabInput.cpp \ - dabInputDabplusFifo.h dabInputDabplusFifo.cpp \ - dabInputDabplusFile.h dabInputDabplusFile.cpp \ - dabInputDmbFile.h dabInputDmbFile.cpp \ - dabInputDmbUdp.h dabInputDmbUdp.cpp \ - dabInputEnhancedFifo.h dabInputEnhancedFifo.cpp \ - dabInputEnhancedPacketFile.h dabInputEnhancedPacketFile.cpp \ - dabInputFifo.h dabInputFifo.cpp \ - dabInputFile.h dabInputFile.cpp \ - dabInputMpegFifo.h dabInputMpegFifo.cpp \ - dabInputMpegFile.h dabInputMpegFile.cpp \ - dabInputPacketFile.h dabInputPacketFile.cpp \ - dabInputPrbs.h dabInputPrbs.cpp \ - dabInputRawFile.h dabInputRawFile.cpp \ - dabInputRawFifo.h dabInputRawFifo.cpp \ - dabInputUdp.h dabInputUdp.cpp \ - dabInputZmq.h dabInputZmq.cpp \ + input/inputs.h \ + input/Prbs.cpp input/Prbs.h \ + input/Zmq.cpp input/Zmq.h \ + input/File.cpp input/File.h \ + input/Udp.cpp input/Udp.h \ dabOutput/dabOutput.h \ dabOutput/dabOutputFile.cpp \ dabOutput/dabOutputFifo.cpp \ |