diff options
| author | Christian Linke <christian.linke@bmw.de> | 2013-09-09 18:40:19 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2013-09-09 18:40:19 +0200 |
| commit | db8583483517265e9d6b0fdb3add2cad2cdbcca9 (patch) | |
| tree | 5bcc78fc3ab73e04e1a6d7f37914334709ea2c65 /AudioManagerDaemon/src | |
| parent | 67b6d070bdea90463aab419d516186f498ebc6d6 (diff) | |
| download | audiomanager-db8583483517265e9d6b0fdb3add2cad2cdbcca9.tar.gz | |
* some naming adoptions & review for GENIVI
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src')
| -rw-r--r-- | AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp index 3761fca..6ac8f53 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp @@ -32,7 +32,7 @@ #include "shared/CAmDltWrapper.h" #include "CAmNodeStateCommunicatorCAPI.h" #include "CAmControlSender.h" -#include "LifeCycleConsumer.h" +#include <org/genivi/NodeStateManager/LifeCycleConsumerProxy.h> @@ -122,7 +122,13 @@ am_Error_e CAmNodeStateCommunicatorCAPI::nsmGetRestartReasonProperty(NsmRestartR //Check the service via the proxy object is available IF_NOT_AVAILABLE_RETURN(E_NOT_POSSIBLE) //Get the attribute - return getAttributeValue(&mNSMProxy->getRestartReasonAttribute(), restartReason); + int32_t value; + CommonAPI::CallStatus status; + mNSMProxy->getRestartReasonAttribute().getValue(status,value); + if (status!=CommonAPI::CallStatus::SUCCESS) + return (E_UNKNOWN); + restartReason=static_cast<NsmRestartReason_e>(value); + return (E_OK); } /** retrieves the actual shutdown reason @@ -135,7 +141,13 @@ am_Error_e CAmNodeStateCommunicatorCAPI::nsmGetShutdownReasonProperty(NsmShutdow //Check the service via the proxy object is available IF_NOT_AVAILABLE_RETURN(E_NOT_POSSIBLE) //Get the attribute - return getAttributeValue(&mNSMProxy->getShutdownReasonAttribute(), ShutdownReason); + int32_t value; + CommonAPI::CallStatus status; + mNSMProxy->getShutdownReasonAttribute().getValue(status,value); + if (status!=CommonAPI::CallStatus::SUCCESS) + return (E_UNKNOWN); + ShutdownReason=static_cast<NsmShutdownReason_e>(value); + return (E_OK); } /** retrieves the actual running reason @@ -148,7 +160,13 @@ am_Error_e CAmNodeStateCommunicatorCAPI::nsmGetRunningReasonProperty(NsmRunningR //Check the service via the proxy object is available IF_NOT_AVAILABLE_RETURN(E_NOT_POSSIBLE) //Get the attribute - return getAttributeValue(&mNSMProxy->getWakeUpReasonAttribute(), nsmRunningReason); + int32_t value; + CommonAPI::CallStatus status; + mNSMProxy->getWakeUpReasonAttribute().getValue(status,value); + if (status!=CommonAPI::CallStatus::SUCCESS) + return (E_UNKNOWN); + nsmRunningReason=static_cast<NsmRunningReason_e>(value); + return (E_OK); } /** gets the node state @@ -186,7 +204,7 @@ NsmErrorStatus_e CAmNodeStateCommunicatorCAPI::nsmGetSessionState(const std::str CallStatus callStatus; int32_t tmpSessionState = 0 , errorCode = 0; - mNSMProxy->GetSessionState(sessionName, seatID, callStatus, tmpSessionState, errorCode); + mNSMProxy->GetSessionState(sessionName,seatID,callStatus, tmpSessionState, errorCode); if( CallStatus::SUCCESS == callStatus) { |