From 491b4ca8e109c510f9577e45e263214ebfd135ba Mon Sep 17 00:00:00 2001 From: christian linke Date: Mon, 7 Jan 2013 18:07:41 +0100 Subject: * enable turning off the NSM Signed-off-by: christian linke --- AudioManagerDaemon/src/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'AudioManagerDaemon/src') 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); -- cgit v1.2.1