diff options
| author | Christian Linke <christian.linke@bmw.de> | 2015-09-22 17:32:01 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-09-22 17:32:01 +0100 |
| commit | bd7ec24a2abe47ae4398b23282e8288e00eaec47 (patch) | |
| tree | 778cf5ffa440b44752bb1cbcfd4c75d950bd48c4 /AudioManagerDaemon/src/main.cpp | |
| parent | a9f86b94f3cc83a9474e8a0d7e21de4c8e452526 (diff) | |
| download | audiomanager-bd7ec24a2abe47ae4398b23282e8288e00eaec47.tar.gz | |
Remove nodestatemanager7.2
Make audiomanager compile with Dbus and CommonAPI Wrapper at the same time
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
| -rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 6db7715..5942e18 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -30,20 +30,13 @@ #ifdef WITH_CAPI_WRAPPER #include "CAmCommonAPIWrapper.h" -#else - #ifdef WITH_DBUS_WRAPPER - #include "CAmDbusWrapper.h" - #endif #endif -#ifdef WITH_NSM - #ifdef WITH_DBUS_WRAPPER - #include "CAmNodeStateCommunicatorDBus.h" - #else - #include "CAmNodeStateCommunicatorCAPI.h" - #endif +#ifdef WITH_DBUS_WRAPPER + #include "CAmDbusWrapper.h" #endif + #ifdef WITH_DATABASE_STORAGE #include "CAmDatabaseHandlerSQLite.h" #else @@ -336,19 +329,12 @@ void mainProgram(int argc, char *argv[]) #ifdef WITH_CAPI_WRAPPER //We instantiate a singleton with the current socket handler, which loads the common-api runtime. CAmCommonAPIWrapper *pCAPIWrapper = CAmCommonAPIWrapper::instantiateOnce(&iSocketHandler, "AudioManager"); - CAmCommonAPIWrapper iDBusWrapper = *pCAPIWrapper; -#ifdef WITH_NSM - CAmNodeStateCommunicatorCAPI iNodeStateCommunicator(&iDBusWrapper); -#endif /*WITH_NSM*/ #endif /*WITH_CAPI_WRAPPER */ #ifdef WITH_DBUS_WRAPPER if (dbusWrapperTypeBool.getValue()) dbusWrapperType=DBUS_BUS_SYSTEM; CAmDbusWrapper iDBusWrapper(&iSocketHandler,dbusWrapperType); -#ifdef WITH_NSM - CAmNodeStateCommunicatorDBus iNodeStateCommunicator(&iDBusWrapper); -#endif /*WITH_NSM*/ #endif /*WITH_DBUS_WRAPPER */ #ifdef WITH_SYSTEMD_WATCHDOG @@ -371,12 +357,7 @@ void mainProgram(int argc, char *argv[]) CAmRoutingReceiver iRoutingReceiver(pDatabaseHandler,&iRoutingSender,&iControlSender,&iSocketHandler); #endif /*WITH_DBUS_WRAPPER*/ -#ifdef WITH_NSM - CAmControlReceiver iControlReceiver(pDatabaseHandler,&iRoutingSender,&iCommandSender,&iSocketHandler, &iRouter, &iNodeStateCommunicator); - iNodeStateCommunicator.registerControlSender(&iControlSender); -#else /*WITH_NSM*/ - CAmControlReceiver iControlReceiver(pDatabaseHandler,&iRoutingSender,&iCommandSender,&iSocketHandler, &iRouter); -#endif /*WITH_NSM*/ +CAmControlReceiver iControlReceiver(pDatabaseHandler,&iRoutingSender,&iCommandSender,&iSocketHandler, &iRouter); #ifdef WITH_TELNET CAmTelnetServer iTelnetServer(&iSocketHandler, &iCommandSender, &iCommandReceiver, &iRoutingSender, &iRoutingReceiver, &iControlSender, &iControlReceiver, pDatabaseHandler, &iRouter, telnetPort.getValue(), maxConnections.getValue()); |