diff options
author | GENIVI Audio Manager Maintainer <genivi-maint-audiomanager@smtp1.genivi.org> | 2018-02-26 08:59:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-26 08:59:12 +0100 |
commit | cfded6ea1a53e5387e1f24c0a9132f363247669b (patch) | |
tree | a3ece549d48b4b15653b60102f6ea4bd4599f8b2 /AudioManagerDaemon/src/main.cpp | |
parent | bcaeed20bbbb4375ae925d507821d2bef64e737b (diff) | |
parent | cc84de5b43ebd21e57b1411124fcc3a725bf6b88 (diff) | |
download | audiomanager-cfded6ea1a53e5387e1f24c0a9132f363247669b.tar.gz |
Merge pull request #25 from JensLorenz/version_and_doc_update
Version and doc update
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
-rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 8271db4..171d6ef 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -162,7 +162,7 @@ void daemonize() void printCmdInformation() { printf("\n\n\nCurrent settings:\n\n"); - printf("\tAudioManagerDaemon Version:\t\t%s\n", DAEMONVERSION); + printf("\tAudioManagerDaemon Version:\t\t%s\n", DAEMONVERSION EXTRAVERSIONINFO); printf("\tControllerPlugin: \t\t\t%s\n", controllerPlugin.getValue().c_str()); printf("\tDirectories of CommandPlugins: \t\t\n"); std::vector<std::string>::const_iterator dirIter = listCommandPluginDirs.begin(); @@ -219,19 +219,19 @@ void mainProgram(int argc, char *argv[]) //initialize the commandline parser, and add all neccessary commands try { - TCLAP::CmdLine* cmd(CAmCommandLineSingleton::instanciateOnce("The team of the AudioManager wishes you a nice day!",' ',DAEMONVERSION,true)); - cmd->add(controllerPlugin); - cmd->add(additionalCommandPluginDirs); - cmd->add(commandPluginDir); - cmd->add(additionalRoutingPluginDirs); - cmd->add(routingPluginDir); - cmd->add(currentSettings); - cmd->add(daemonizeAM); - cmd->add(dltEnable); - cmd->add(dltLogFilename); - cmd->add(dltOutput); + TCLAP::CmdLine* cmd(CAmCommandLineSingleton::instanciateOnce("The team of the AudioManager wishes you a nice day!",' ', DAEMONVERSION EXTRAVERSIONINFO,true)); + cmd->add(controllerPlugin); + cmd->add(additionalCommandPluginDirs); + cmd->add(commandPluginDir); + cmd->add(additionalRoutingPluginDirs); + cmd->add(routingPluginDir); + cmd->add(currentSettings); + cmd->add(daemonizeAM); + cmd->add(dltEnable); + cmd->add(dltLogFilename); + cmd->add(dltOutput); #ifdef WITH_DBUS_WRAPPER - cmd->add(dbusWrapperTypeBool); + cmd->add(dbusWrapperTypeBool); #endif } catch (TCLAP::ArgException &e) // catch any exceptions @@ -330,7 +330,7 @@ void mainProgram(int argc, char *argv[]) { std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; } logInfo("The Audiomanager is started"); - logInfo("The version of the Audiomanager", DAEMONVERSION); + logInfo("The version of the Audiomanager", DAEMONVERSION EXTRAVERSIONINFO); #ifdef WITH_CAPI_WRAPPER //We instantiate a singleton with the current socket handler, which loads the common-api runtime. |