diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:46:26 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:52:08 +0100 |
| commit | 2e646a26c9db66dd5776667d9c9b73d798f5ffda (patch) | |
| tree | 539571430a853a24f5ed46ed6c0aeb1fd671fc93 /src/DabMod.cpp | |
| parent | 076ac8aaf7adfeca57d5d04d4b2f066bb6db54ee (diff) | |
| download | dabmod-2e646a26c9db66dd5776667d9c9b73d798f5ffda.tar.gz dabmod-2e646a26c9db66dd5776667d9c9b73d798f5ffda.tar.bz2 dabmod-2e646a26c9db66dd5776667d9c9b73d798f5ffda.zip | |
Merge input-zeromq and output-zeromq configure options
Diffstat (limited to 'src/DabMod.cpp')
| -rw-r--r-- | src/DabMod.cpp | 17 |
1 files changed, 7 insertions, 10 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; |