diff options
| author | christian linke <christian.linke@bmw.de> | 2013-01-07 18:07:41 +0100 |
|---|---|---|
| committer | christian linke <christian.linke@bmw.de> | 2013-01-07 18:07:41 +0100 |
| commit | 491b4ca8e109c510f9577e45e263214ebfd135ba (patch) | |
| tree | 1fcdd252f6ef71785139e9d19c8c941ea70beb87 | |
| parent | 8f43ba9159a4f9f5efbf9c2515f314cc58737d48 (diff) | |
| download | audiomanager-491b4ca8e109c510f9577e45e263214ebfd135ba.tar.gz | |
* enable turning off the NSM
Signed-off-by: christian linke <christian.linke@bmw.de>
| -rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 6 | ||||
| -rwxr-xr-x | CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | README | 3 | ||||
| -rw-r--r-- | cmake/config.cmake | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 51003cf..f8319b3 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -301,7 +301,9 @@ void mainProgram() #ifdef WITH_DBUS_WRAPPER CAmDbusWrapper iDBusWrapper(&iSocketHandler,dbusWrapperType); +#ifdef WITH_NSM CAmNodeStateCommunicator iNodeStateCommunicator(&iDBusWrapper); +#endif /*WITH_NSM*/ #endif /*WITH_DBUS_WRAPPER */ #ifdef WITH_SYSTEMD_WATCHDOG @@ -317,8 +319,12 @@ void mainProgram() #ifdef WITH_DBUS_WRAPPER CAmCommandReceiver iCommandReceiver(&iDatabaseHandler, &iControlSender, &iSocketHandler, &iDBusWrapper); CAmRoutingReceiver iRoutingReceiver(&iDatabaseHandler, &iRoutingSender, &iControlSender, &iSocketHandler, &iDBusWrapper); +#ifdef WITH_NSM CAmControlReceiver iControlReceiver(&iDatabaseHandler,&iRoutingSender,&iCommandSender,&iSocketHandler, &iRouter, &iNodeStateCommunicator); iNodeStateCommunicator.registerControlSender(&iControlSender); +#else /*WITH_NSM*/ + CAmControlReceiver iControlReceiver(&iDatabaseHandler,&iRoutingSender,&iCommandSender,&iSocketHandler, &iRouter); +#endif /*WITH_NSM*/ #else /*WITH_DBUS_WRAPPER*/ CAmCommandReceiver iCommandReceiver(&iDatabaseHandler,&iControlSender,&iSocketHandler); CAmRoutingReceiver iRoutingReceiver(&iDatabaseHandler,&iRoutingSender,&iControlSender,&iSocketHandler); diff --git a/CMakeLists.txt b/CMakeLists.txt index 8632ec8..1f4e4da 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,9 @@ OPTION ( USE_BUILD_LIBS OPTION ( GLIB_DBUS_TYPES_TOLERANT "build dbus with tolerance towards glib 16bit/32bit handling" ON) + +OPTION ( WITH_NSM + "build with NSM support" ON) #Can be changed via passing -DDBUS_SERVICE_PREFIX="XXX" to cmake @@ -70,7 +70,8 @@ These are the compile options with default values: WITH_PLUGIN_ROUTING ON WITH_SYSTEMD_WATCHDOG OFF WITH_TELNET ON - WITH_TESTS ON + WITH_TESTS ON + WITH_NSM ON gmock_build_tests OFF gtest_build_samples OFF gtest_build_tests OFF diff --git a/cmake/config.cmake b/cmake/config.cmake index cab37fc..03efd6b 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -9,6 +9,8 @@ #cmakedefine GLIB_DBUS_TYPES_TOLERANT #cmakedefine WITH_SYSTEMD_WATCHDOG #cmakedefine SYSTEMD_FOUND +#cmakedefine WITH_NSM + #cmakedefine DEFAULT_PLUGIN_COMMAND_DIR "@DEFAULT_PLUGIN_COMMAND_DIR@" #cmakedefine DEFAULT_PLUGIN_ROUTING_DIR "@DEFAULT_PLUGIN_ROUTING_DIR@" |