aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-30 12:56:02 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-30 12:56:02 +0100
commitbbf23c4d8acb28eba6da018271330d674b8e8dd4 (patch)
treebc36cbeac0a6ed3d012c8447c8a724b2c500c2e6 /src
parentea9f9c8a241b7cc74fce905b6839398737481efc (diff)
downloaddabmux-bbf23c4d8acb28eba6da018271330d674b8e8dd4.tar.gz
dabmux-bbf23c4d8acb28eba6da018271330d674b8e8dd4.tar.bz2
dabmux-bbf23c4d8acb28eba6da018271330d674b8e8dd4.zip
Make compilation possible with all formats disabled
Diffstat (limited to 'src')
-rw-r--r--src/ConfigParser.cpp4
-rw-r--r--src/dabInputEnhancedPacketFile.cpp7
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 3bcf9fc..7e3f855 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -728,8 +728,10 @@ static void setup_subchannel_from_ptree(DabSubchannel* subchan,
} else if (proto == "file") {
operations = dabInputRawFileOperations;
#endif
+#if defined(HAVE_INPUT_FIFO)
} else if (proto == "fifo") {
operations = dabInputRawFifoOperations;
+#endif
} else {
stringstream ss;
ss << "Subchannel with uid " << subchanuid <<
@@ -855,8 +857,8 @@ static void setup_subchannel_from_ptree(DabSubchannel* subchan,
" non-blocking I/O only available for audio or packet services!";
throw runtime_error(ss.str());
}
-#endif // defined(HAVE_INPUT_FIFO) && defined(HAVE_INPUT_FILE)
}
+#endif // defined(HAVE_INPUT_FIFO) && defined(HAVE_INPUT_FILE)
/* Get id */
diff --git a/src/dabInputEnhancedPacketFile.cpp b/src/dabInputEnhancedPacketFile.cpp
index 3b12e0b..5c26188 100644
--- a/src/dabInputEnhancedPacketFile.cpp
+++ b/src/dabInputEnhancedPacketFile.cpp
@@ -23,6 +23,9 @@
#include "dabInputPacketFile.h"
#include "dabInputFile.h"
+#ifdef HAVE_FORMAT_PACKET
+# ifdef HAVE_FORMAT_EPM
+# ifdef HAVE_INPUT_FILE
struct dabInputOperations dabInputEnhancedPacketFileOperations = {
dabInputEnhancedFileInit,
@@ -51,3 +54,7 @@ int dabInputEnhancedFileInit(void** args)
return 0;
}
+
+# endif
+# endif
+#endif