diff options
author | christian linke <christian.linke@bmw.de> | 2013-01-09 15:01:19 +0100 |
---|---|---|
committer | christian linke <christian.linke@bmw.de> | 2013-01-09 15:01:19 +0100 |
commit | 1c3e5d99546d0c2d803d50411168d0d887365399 (patch) | |
tree | 75e990e26706fe0116156976071593a3bff56135 /AudioManagerDaemon/src | |
parent | 5485dee80853f3d014f929d538eb02fee1a62a66 (diff) | |
download | audiomanager-1c3e5d99546d0c2d803d50411168d0d887365399.tar.gz |
* fix WITH_NSM=off option
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src')
-rw-r--r-- | AudioManagerDaemon/src/CAmControlReceiver.cpp | 68 | ||||
-rw-r--r-- | AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp | 1 | ||||
-rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 9 |
3 files changed, 73 insertions, 5 deletions
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp index cfa9467..86c6399 100644 --- a/AudioManagerDaemon/src/CAmControlReceiver.cpp +++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp @@ -28,9 +28,12 @@ #include "CAmRoutingSender.h" #include "CAmCommandSender.h" #include "CAmRouter.h" -#include "CAmNodeStateCommunicator.h" #include "shared/CAmDltWrapper.h" #include "shared/CAmSocketHandler.h" +#ifdef WITH_NSM + #include "CAmNodeStateCommunicator.h" +#endif + namespace am { @@ -605,70 +608,133 @@ am_Error_e CAmControlReceiver::nsmGetRestartReasonProperty(NsmRestartReason_e& r { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetRestartReasonProperty(restartReason)); +#else + (void)restartReason; + return (E_NON_EXISTENT); +#endif } am_Error_e CAmControlReceiver::nsmGetShutdownReasonProperty(NsmShutdownReason_e& ShutdownReason) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetShutdownReasonProperty(ShutdownReason)); +#else + (void)ShutdownReason; + return (E_NON_EXISTENT); +#endif + } am_Error_e CAmControlReceiver::nsmGetRunningReasonProperty(NsmRunningReason_e& nsmRunningReason) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetRunningReasonProperty(nsmRunningReason)); +#else + (void)nsmRunningReason; + return (E_NON_EXISTENT); +#endif + } NsmErrorStatus_e CAmControlReceiver::nsmGetNodeState(NsmNodeState_e& nsmNodeState) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetNodeState(nsmNodeState)); +#else + (void) nsmNodeState; + return (NsmErrorStatus_Error); +#endif + } NsmErrorStatus_e CAmControlReceiver::nsmGetSessionState(const std::string& sessionName, const NsmSeat_e& seatID, NsmSessionState_e& sessionState) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetSessionState(sessionName,seatID,sessionState)); +#else + (void) sessionName; + (void) seatID; + (void) sessionState; + return (NsmErrorStatus_Error); +#endif + } NsmErrorStatus_e CAmControlReceiver::nsmGetApplicationMode(NsmApplicationMode_e& applicationMode) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetApplicationMode(applicationMode)); +#else + (void) applicationMode; + return (NsmErrorStatus_Error); +#endif + } NsmErrorStatus_e CAmControlReceiver::nsmRegisterShutdownClient(const uint32_t shutdownMode, const uint32_t timeoutMs) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmRegisterShutdownClient(shutdownMode,timeoutMs)); +#else + (void) shutdownMode; + (void) timeoutMs; + return (NsmErrorStatus_Error); +#endif + } NsmErrorStatus_e CAmControlReceiver::nsmUnRegisterShutdownClient(const uint32_t shutdownMode) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmUnRegisterShutdownClient(shutdownMode)); +#else + (void) shutdownMode; + return (NsmErrorStatus_Error); +#endif + } am_Error_e CAmControlReceiver::nsmGetInterfaceVersion(uint32_t& version) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmGetInterfaceVersion(version)); +#else + (void) version; + return (E_NON_EXISTENT); +#endif + } NsmErrorStatus_e CAmControlReceiver::nsmSendLifecycleRequestComplete(const uint32_t RequestId, const NsmErrorStatus_e status) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); +#ifdef WITH_NSM return (mNodeStateCommunicator->nsmSendLifecycleRequestComplete(RequestId,status)); +#else + (void) RequestId; + (void) status; + return (NsmErrorStatus_Error); +#endif + } } diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp index 16c5e8b..a80e44b 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp @@ -25,7 +25,6 @@ #include <fstream> #include <stdexcept> #include "CAmControlSender.h" -#include "shared/CAmDbusWrapper.h" #include "shared/CAmDltWrapper.h" #include "config.h" diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index f8319b3..de10b73 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -30,10 +30,13 @@ #include "config.h" #ifdef WITH_TELNET -#include "CAmTelnetServer.h" + #include "CAmTelnetServer.h" #endif #ifdef WITH_DBUS_WRAPPER -#include <shared/CAmDbusWrapper.h> + #include "shared/CAmDbusWrapper.h" +#endif +#ifdef WITH_NSM + #include "CAmNodeStateCommunicator.h" #endif #include <sys/resource.h> @@ -57,11 +60,11 @@ #include "CAmControlReceiver.h" #include "CAmDatabaseObserver.h" #include "CAmWatchdog.h" -#include "CAmNodeStateCommunicator.h" #include "shared/CAmDltWrapper.h" #include "shared/CAmSocketHandler.h" + using namespace am; DLT_DECLARE_CONTEXT(AudioManager) |