Merge input-zeromq and output-zeromq configure options

7 files changed, 17 insertions, 20 deletions

diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 4912bee..cc7dd96 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -213,7 +213,7 @@ int main(int argc, char* argv[])
 
     Logger logger;
     InputFileReader inputFileReader(logger);
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
     InputZeroMQReader inputZeroMQReader(logger);
 #endif
     InputReader* inputReader;
@@ -352,15 +352,12 @@ int main(int argc, char* argv[])
         "\n";
 
     std::cerr << "Compiled with features: " <<
-#if defined(HAVE_INPUT_ZEROMQ)
-        "input_zeromq " <<
+#if defined(HAVE_ZEROMQ)
+        "zeromq " <<
 #endif
 #if defined(HAVE_OUTPUT_UHD)
         "output_uhd " <<
 #endif
-#if defined(HAVE_OUTPUT_ZEROMQ)
-        "output_zeromq " <<
-#endif
         "\n";
 
     if (use_configuration_file && use_configuration_cmdline) {
@@ -408,7 +405,7 @@ int main(int argc, char* argv[])
             }
         }
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
         if (pt.get("remotecontrol.zmqctrl", 0) == 1) {
             try {
                 std::string zmqCtrlEndpoint = pt.get("remotecontrol.zmqctrlendpoint", "");
@@ -592,7 +589,7 @@ int main(int argc, char* argv[])
             useUHDOutput = 1;
         }
 #endif
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
         else if (output_selected == "zmq") {
             outputName = pt.get<std::string>("zmqoutput.listen");
             useZeroMQOutput = 1;
@@ -735,7 +732,7 @@ int main(int argc, char* argv[])
         inputReader = &inputFileReader;
     }
     else if (inputTransport == "zeromq") {
-#if !defined(HAVE_INPUT_ZEROMQ)
+#if !defined(HAVE_ZEROMQ)
         fprintf(stderr, "Error, ZeroMQ input transport selected, but not compiled in!\n");
         ret = -1;
         goto END_MAIN;
@@ -786,7 +783,7 @@ int main(int argc, char* argv[])
         }
     }
 #endif
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
     else if (useZeroMQOutput) {
         /* We normalise the same way as for the UHD output */
         normalise = 1.0f/50000.0f;
diff --git a/src/InputReader.h b/src/InputReader.h
index 164c5ac..3e0dcab 100644
--- a/src/InputReader.h
+++ b/src/InputReader.h
@@ -31,7 +31,7 @@
 #endif
 
 #include <cstdio>
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 #  include "zmq.hpp"
 #  include "ThreadsafeQueue.h"
 #endif
@@ -130,7 +130,7 @@ class InputFileReader : public InputReader
                             // after 2**32 * 24ms ~= 3.3 years
 };
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 /* A ZeroMQ input. See www.zeromq.org for more info */
 
 struct InputZeroMQThreadData
diff --git a/src/InputZeroMQReader.cpp b/src/InputZeroMQReader.cpp
index cfb56b2..f7f5702 100644
--- a/src/InputZeroMQReader.cpp
+++ b/src/InputZeroMQReader.cpp
@@ -29,7 +29,7 @@
 #   include "config.h"
 #endif
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 #include <string>
 #include <cstring>
diff --git a/src/OutputZeroMQ.cpp b/src/OutputZeroMQ.cpp
index 0e759dd..793e473 100644
--- a/src/OutputZeroMQ.cpp
+++ b/src/OutputZeroMQ.cpp
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sstream>
 
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 OutputZeroMQ::OutputZeroMQ(std::string endpoint, Buffer* dataOut)
     : ModOutput(ModFormat(1), ModFormat(0)),
@@ -63,5 +63,5 @@ int OutputZeroMQ::process(Buffer* dataIn, Buffer* dataOut)
     return dataIn->getLength();
 }
 
-#endif // HAVE_OUTPUT_ZEROMQ_H
+#endif // HAVE_ZEROMQ
 
diff --git a/src/OutputZeroMQ.h b/src/OutputZeroMQ.h
index 1c48fe7..a80eab4 100644
--- a/src/OutputZeroMQ.h
+++ b/src/OutputZeroMQ.h
@@ -31,7 +31,7 @@
 #   include "config.h"
 #endif
 
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 #include "ModOutput.h"
 #include "zmq.hpp"
@@ -54,7 +54,7 @@ class OutputZeroMQ : public ModOutput
         std::string m_name;
 };
 
-#endif // HAVE_OUTPUT_ZEROMQ_H
+#endif // HAVE_ZEROMQ
 
 #endif // OUTPUT_ZEROMQ_H
 
diff --git a/src/RemoteControl.cpp b/src/RemoteControl.cpp
index 1e8dda5..65da3b7 100644
--- a/src/RemoteControl.cpp
+++ b/src/RemoteControl.cpp
@@ -248,7 +248,7 @@ void RemoteControllerTelnet::reply(tcp::socket& socket, string message)
 }
 
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 void RemoteControllerZmq::restart()
 {
diff --git a/src/RemoteControl.h b/src/RemoteControl.h
index 905e153..89a1583 100644
--- a/src/RemoteControl.h
+++ b/src/RemoteControl.h
@@ -33,7 +33,7 @@
 #   include "config.h"
 #endif
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 #include <zmq.hpp>
 #endif
 
@@ -295,7 +295,7 @@ class RemoteControllerTelnet : public BaseRemoteController {
         int m_port;
 };
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 /* Implements a Remote controller using zmq transportlayer
  * that listens on localhost
  */