Merge branch 'next' into servicelinking

1 files changed, 4 insertions, 20 deletions

diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index 2af58c5..04d1980 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -94,24 +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 "dabInputBridgeUdp.h"
-#include "dabInputTest.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"
@@ -411,7 +395,7 @@ int main(int argc, char *argv[])
 
 
         if (outputs.size() == 0) {
-            etiLog.log(emerg, "no output defined");
+            etiLog.log(alert, "no output defined");
             throw MuxInitException();
         }
 
@@ -491,7 +475,7 @@ int main(int argc, char *argv[])
     outputs.clear();
 
     if (returnCode != 0) {
-        etiLog.log(emerg, "...aborting\n");
+        etiLog.log(alert, "...aborting\n");
     } else {
         etiLog.log(debug, "...done\n");
     }