diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-16 22:53:03 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-16 22:53:03 +0100 |
| commit | fdb59da8301c3679c6cebf54022b24048370184b (patch) | |
| tree | 1f4211ca4c28a5052bff3e9c3903067e0026adfd | |
| parent | 173f1d8bf78f59320c95148dd21611ea3b6b7153 (diff) | |
| download | dabmod-fdb59da8301c3679c6cebf54022b24048370184b.tar.gz dabmod-fdb59da8301c3679c6cebf54022b24048370184b.tar.bz2 dabmod-fdb59da8301c3679c6cebf54022b24048370184b.zip | |
Show version right at startup
| -rw-r--r-- | src/DabMod.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index fc589ec..13e4904 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -305,6 +305,14 @@ int main(int argc, char* argv[]) } } + std::cerr << "ODR-DabMod version " << +#if defined(GITVERSION) + GITVERSION +#else + VERSION +#endif + << std::endl; + if (use_configuration_file && use_configuration_cmdline) { fprintf(stderr, "Warning: configuration file and command line parameters are defined:\n\t" "Command line parameters override settings in the configuration file !\n"); @@ -538,13 +546,7 @@ int main(int argc, char* argv[]) outputuhd_conf.muteNoTimestamps = (pt.get("delaymanagement.mutenotimestamps", 0) == 1); } - logger.level(info) << "Version " << -#if defined(GITVERSION) - GITVERSION -#else - VERSION -#endif - << " starting up"; + logger.level(info) << "Starting up"; if (!(modconf.use_offset_file || modconf.use_offset_fixed)) { logger.level(debug) << "No Modulator offset defined, setting to 0"; @@ -652,11 +654,9 @@ int main(int argc, char* argv[]) if (useFileOutput) { // Opening COFDM output file - fprintf(stderr, "Using file output '%s'\n", outputName.c_str()); output = new OutputFile(outputName); } else if (useUHDOutput) { - fprintf(stderr, "Using UHD output\n"); amplitude /= 32000.0f; outputuhd_conf.sampleRate = outputRate; try { |