diff options
-rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 10 | ||||
-rwxr-xr-x | CMakeLists.txt | 8 | ||||
-rw-r--r-- | cmake/config.cmake.in | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index f07cfae..6f5c273 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -61,6 +61,14 @@ #include "CAmCommandLineSingleton.h" #include "CAmDatabaseHandlerMap.h" +#ifndef AUDIOMANGER_APP_ID + #define AUDIOMANGER_APP_ID "AUDI" +#endif + +#ifndef AUDIOMANGER_APP_DESCRIPTION + #define AUDIOMANGER_APP_DESCRIPTION "AudioManager" +#endif + using namespace am; @@ -244,7 +252,7 @@ void mainProgram(int argc, char *argv[]) daemonize(); } - CAmDltWrapper::instanctiateOnce("AUDI", "AudioManager",dltEnable.getValue(),static_cast<am::CAmDltWrapper::logDestination>(dltOutput.getValue()),dltLogFilename.getValue()); + CAmDltWrapper::instanctiateOnce(AUDIOMANGER_APP_ID, AUDIOMANGER_APP_DESCRIPTION ,dltEnable.getValue(),static_cast<am::CAmDltWrapper::logDestination>(dltOutput.getValue()),dltLogFilename.getValue()); //Instantiate all classes. Keep in same order ! CAmSocketHandler iSocketHandler; diff --git a/CMakeLists.txt b/CMakeLists.txt index 04e352c..6204e12 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,12 @@ set(AM_MAX_CONNECTIONS 0x1000 set(AM_MAX_MAIN_CONNECTIONS 0x1000 CACHE INTEGER "Number of max Mainconnections before rollover") + +set(AUDIOMANGER_APP_ID "AUDI" + CACHE PROPERTY "The application ID that is used by the audiomanager") + +set(AUDIOMANGER_APP_DESCRIPTION "Audiomanager" + CACHE PROPERTY "The description of the Audiomanager application") set(AUDIOMANAGER_INCLUDE_FOLDER ${CMAKE_BINARY_DIR}/include) set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include) @@ -221,6 +227,8 @@ message(STATUS "AM_MAX_CONNECTIONS = ${AM_MAX_CONNECTIONS}") message(STATUS "AM_MAX_MAIN_CONNECTIONS = ${AM_MAX_MAIN_CONNECTIONS}") message(STATUS "BUILD_TESTING = ${BUILD_TESTING}") message(STATUS "CMAKE_INSTALL_DOCDIR = ${CMAKE_INSTALL_DOCDIR}") +message(STATUS "AUDIOMANGER_APP_ID = ${AUDIOMANGER_APP_ID}") +message(STATUS "AUDIOMANGER_APP_DESCRIPTION = ${AUDIOMANGER_APP_DESCRIPTION}") message(STATUS "CommandInterface version: ${LIB_COMMAND_INTERFACE_VERSION}") message(STATUS "ControlInterface version: ${LIB_CONTROL_INTERFACE_VERSION}") message(STATUS "RoutingInterface version: ${LIB_ROUTING_INTERFACE_VERSION}") diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 3ebec7c..a5b2337 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -31,6 +31,9 @@ #cmakedefine LIB_CONTROL_INTERFACE_VERSION @LIB_CONTROL_INTERFACE_VERSION@ #cmakedefine LIB_ROUTING_INTERFACE_VERSION @LIB_ROUTING_INTERFACE_VERSION@ +#cmakedefine AUDIOMANGER_APP_ID "@AUDIOMANGER_APP_ID@" +#cmakedefine AUDIOMANGER_APP_DESCRIPTION "@AUDIOMANGER_APP_DESCRIPTION@" + enum { DYNAMIC_ID_BOUNDARY = @DYNAMIC_ID_BOUNDARY@ }; #endif /* _CONFIG_H */ |