diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp')
-rw-r--r-- | PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp | 90 |
1 files changed, 46 insertions, 44 deletions
diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp index 3f2c7b3..bce9aef 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp @@ -31,23 +31,24 @@ const char * CAmRoutingSenderService::ROUTING_SENDER_SERVICE = CAPI_SENDER_ADDRE const char * CAmRoutingSenderService::ROUTING_INTERFACE_SERVICE = CAPI_ROUTING_ADDRESS; CAmRoutingSenderService::CAmRoutingSenderService(CAmCommonAPIWrapper * aWrapper): - mDomainData(), mAbortedHandle(UINT_MAX), mIsDomainRegistred(false), mIsServiceAvailable(0), mIsReady(0), mpWrapper(aWrapper), mRoutingInterfaceProxy(NULL) + mDomainData(), mAbortedHandle(), mIsDomainRegistred(false), mIsServiceAvailable(0), mIsReady(0), mpWrapper(aWrapper), mRoutingInterfaceProxy(NULL) { - + mAbortedHandle.handle=UINT_MAX; } CAmRoutingSenderService::CAmRoutingSenderService(): - mDomainData(), mAbortedHandle(UINT_MAX), mIsDomainRegistred(false), mIsServiceAvailable(0), mIsReady(0), mpWrapper(NULL), mRoutingInterfaceProxy(NULL) { - // TODO Auto-generated constructor stub + mDomainData(), mAbortedHandle(), mIsDomainRegistred(false), mIsServiceAvailable(0), mIsReady(0), mpWrapper(NULL), mRoutingInterfaceProxy(NULL) +{ } -CAmRoutingSenderService::CAmRoutingSenderService(CAmCommonAPIWrapper * aWrapper, std::shared_ptr<RoutingInterfaceProxy<> > aProxy): - mDomainData(), mAbortedHandle(UINT_MAX), mIsDomainRegistred(false), mIsServiceAvailable(0), mIsReady(0), mpWrapper(aWrapper), mRoutingInterfaceProxy(aProxy) +CAmRoutingSenderService::CAmRoutingSenderService(CAmCommonAPIWrapper * aWrapper, std::shared_ptr<org::genivi::am::RoutingControlObserverProxy<> > aProxy): + mDomainData(), mAbortedHandle(), mIsDomainRegistred(false), mIsServiceAvailable(0), mIsReady(0), mpWrapper(aWrapper), mRoutingInterfaceProxy(aProxy) { + mAbortedHandle.handle=UINT_MAX; mRoutingInterfaceProxy->getProxyStatusEvent().subscribe(std::bind(&CAmRoutingSenderService::onServiceStatusEvent,this,std::placeholders::_1)); - mRoutingInterfaceProxy->getSetRoutingReadyEvent().subscribe(std::bind(&CAmRoutingSenderService::onRoutingReadyEvent,this)); - mRoutingInterfaceProxy->getSetRoutingRundownEvent().subscribe(std::bind(&CAmRoutingSenderService::onRoutingReadyRundown,this)); + //mRoutingInterfaceProxy->getSetRoutingReadyEvent().subscribe(std::bind(&CAmRoutingSenderService::onRoutingReadyEvent(),this)); + //mRoutingInterfaceProxy->getSetRoutingRundownEvent().subscribe(std::bind(&CAmRoutingSenderService::onRoutingReadyRundown,this)); } CAmRoutingSenderService::~CAmRoutingSenderService() { @@ -59,6 +60,9 @@ CAmRoutingSenderService::~CAmRoutingSenderService() { void CAmRoutingSenderService::onServiceStatusEvent(const CommonAPI::AvailabilityStatus& serviceStatus) { logInfo(__PRETTY_FUNCTION__); + mIsDomainRegistred = false; + mIsServiceAvailable = false; + mIsReady = false; std::stringstream avail; avail << "(" << static_cast<int>(serviceStatus) << ")"; logInfo("Domain test service status changed to ", avail.str()); @@ -67,13 +71,12 @@ void CAmRoutingSenderService::onServiceStatusEvent(const CommonAPI::Availability { mIsServiceAvailable = true; CommonAPI::CallStatus callStatus; - mRoutingInterfaceProxy->getRoutingReadyState(callStatus, mIsReady); - } - else - { - mIsDomainRegistred = false; - mIsServiceAvailable = false; - mIsReady = false; + org::genivi::am::am_RoutingReady_e readyAttr; + mRoutingInterfaceProxy->getRoutingReadyAttribute().getValue(callStatus,readyAttr); + if (callStatus!=CommonAPI::CallStatus::SUCCESS) + logError(__PRETTY_FUNCTION__,"Could not get RoutingReady"); + else + mIsReady = readyAttr == org::genivi::am::am_RoutingReady_e::RR_READY ? true : false; } } @@ -90,9 +93,9 @@ void CAmRoutingSenderService::onRoutingReadyRundown() mIsDomainRegistred = false; } -void CAmRoutingSenderService::setAbortHandle(uint16_t handle) +void CAmRoutingSenderService::setAbortHandle(org::genivi::am::am_Handle_s handle) { - mAbortedHandle = handle; + mAbortedHandle=handle; } void CAmRoutingSenderService::registerDomain() @@ -101,14 +104,14 @@ void CAmRoutingSenderService::registerDomain() return; mIsDomainRegistred = true; logInfo(__PRETTY_FUNCTION__,"start registering Domain..."); - am_gen::am_Error_e error; + org::genivi::am::am_Error_e error; mDomainData.name = "TestDomain"; mDomainData.busname ="TestDomain"; mDomainData.complete = true; mDomainData.domainID = 0; mDomainData.early = false; mDomainData.nodename = "Test"; - mDomainData.state = am_gen::am_DomainState_e::DS_CONTROLLED; + mDomainData.state = org::genivi::am::am_DomainState_e::DS_CONTROLLED; CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->registerDomain(mDomainData, CAPI_SENDER_INSTANCE, @@ -120,103 +123,102 @@ void CAmRoutingSenderService::registerDomain() logInfo("Domain: got domainID", mDomainData.domainID); } -uint16_t CAmRoutingSenderService::errorForHandle(const uint16_t & handle) +org::genivi::am::am_Error_e CAmRoutingSenderService::errorForHandle(const org::genivi::am::am_Handle_s & handle) { - uint16_t error = E_OK; - if(handle==mAbortedHandle && mAbortedHandle!=UINT_MAX) + org::genivi::am::am_Error_e error = org::genivi::am::am_Error_e::E_OK; + if(handle==mAbortedHandle && mAbortedHandle.handle!=UINT_MAX) { - error = (uint16_t)am_gen::am_Error_e::E_ABORTED; - mAbortedHandle = UINT_MAX; + error = org::genivi::am::am_Error_e::E_ABORTED; + mAbortedHandle.handle = UINT_MAX; } return error; } -void CAmRoutingSenderService::asyncSetSourceState(uint16_t handle, am_gen::am_sourceID_t sourceID, am_gen::am_SourceState_e sourceState) { +void CAmRoutingSenderService::asyncSetSourceState(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_SourceState_e sourceState) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSetSourceState(handle, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::setDomainState(am_gen::am_domainID_t domainID, am_gen::am_DomainState_e domainState, am_gen::am_Error_e& error) { +void CAmRoutingSenderService::setDomainState(org::genivi::am::am_domainID_t domainID, org::genivi::am::am_DomainState_e domainState, org::genivi::am::am_Error_e& error) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; - error = am_gen::am_Error_e::E_OK; + error = org::genivi::am::am_Error_e::E_OK; mRoutingInterfaceProxy->hookDomainStateChange(domainID, domainState, callStatus); } -void CAmRoutingSenderService::asyncSetSourceVolume(am_gen::am_handle_t handle, am_gen::am_sourceID_t sourceID, am_gen::am_volume_t volume, am_gen::am_RampType_e ramp, am_gen::am_time_t time) { +void CAmRoutingSenderService::asyncSetSourceVolume(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_volume_t volume, org::genivi::am::am_RampType_pe ramp, org::genivi::am::am_time_t time) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; - mRoutingInterfaceProxy->ackSetSourceVolume(handle, volume, errorForHandle(handle), callStatus); + mRoutingInterfaceProxy->ackSetSourceVolumeChange(handle, volume, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetSinkVolume(am_gen::am_handle_t handle, am_gen::am_sinkID_t sinkID, am_gen::am_volume_t volume, am_gen::am_RampType_e ramp, am_gen::am_time_t time) { +void CAmRoutingSenderService::asyncSetSinkVolume(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_volume_t volume, org::genivi::am::am_RampType_pe ramp, org::genivi::am::am_time_t time) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; - mRoutingInterfaceProxy->ackSetSinkVolume(handle, volume, errorForHandle(handle), callStatus); + mRoutingInterfaceProxy->ackSetSinkVolumeChange(handle, volume, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncConnect(am_gen::am_handle_t handle, am_gen::am_connectionID_t connectionID, am_gen::am_sourceID_t sourceID, am_gen::am_sinkID_t sinkID, am_gen::am_ConnectionFormat_e connectionFormat) { +void CAmRoutingSenderService::asyncConnect(org::genivi::am::am_Handle_s handle, org::genivi::am::am_connectionID_t connectionID, org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_ConnectionFormat_pe connectionFormat) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackConnect(handle, connectionID, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncDisconnect(am_gen::am_handle_t handle, am_gen::am_connectionID_t connectionID) { +void CAmRoutingSenderService::asyncDisconnect(org::genivi::am::am_Handle_s handle, org::genivi::am::am_connectionID_t connectionID) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackDisconnect(handle, connectionID, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncAbort(am_gen::am_handle_t handle, am_gen::am_Error_e& error) { +void CAmRoutingSenderService::asyncAbort(org::genivi::am::am_Handle_s handle) { logInfo(__FUNCTION__, " called"); mAbortedHandle = handle; - error = am_gen::am_Error_e::E_OK; } -void CAmRoutingSenderService::asyncSetSinkSoundProperties(am_gen::am_handle_t handle, am_gen::am_sinkID_t sinkID, am_gen::am_SoundProperty_L listSoundProperties) { +void CAmRoutingSenderService::asyncSetSinkSoundProperties(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_SoundProperty_L listSoundProperties) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSetSinkSoundProperties(handle, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetSinkSoundProperty(am_gen::am_handle_t handle, am_gen::am_sinkID_t sinkID, am_gen::am_SoundProperty_s soundProperty) { +void CAmRoutingSenderService::asyncSetSinkSoundProperty(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_SoundProperty_s soundProperty) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSetSinkSoundProperty(handle, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetSourceSoundProperties(am_gen::am_handle_t handle, am_gen::am_sourceID_t sourceID, am_gen::am_SoundProperty_L listSoundProperties) { +void CAmRoutingSenderService::asyncSetSourceSoundProperties(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_SoundProperty_L listSoundProperties) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSetSourceSoundProperties(handle, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetSourceSoundProperty(am_gen::am_handle_t handle, am_gen::am_sourceID_t sourceID, am_gen::am_SoundProperty_s soundProperty) { +void CAmRoutingSenderService::asyncSetSourceSoundProperty(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_SoundProperty_s soundProperty) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSetSourceSoundProperty(handle, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncCrossFade(am_gen::am_handle_t handle, am_gen::am_crossfaderID_t crossfaderID, am_gen::am_HotSink_e hotSink, am_gen::am_RampType_e rampType, am_gen::am_time_t time) { +void CAmRoutingSenderService::asyncCrossFade(org::genivi::am::am_Handle_s handle, org::genivi::am::am_crossfaderID_t crossfaderID, org::genivi::am::am_HotSink_e hotSink, org::genivi::am::am_RampType_pe rampType, org::genivi::am::am_time_t time) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; - mRoutingInterfaceProxy->ackCrossFading(handle, hotSink, (am_gen::am_Error_e)errorForHandle(handle), callStatus); + mRoutingInterfaceProxy->ackCrossFading(handle, hotSink, (org::genivi::am::am_Error_e)errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetVolumes(am_gen::am_handle_t handle, am_gen::am_Volumes_l volumes) { +void CAmRoutingSenderService::asyncSetVolumes(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Volumes_L volumes) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSetVolumes(handle, volumes, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetSinkNotificationConfiguration(am_gen::am_handle_t handle, am_gen::am_sinkID_t sinkID, am_gen::am_NotificationConfiguration_s notificationConfiguration) { +void CAmRoutingSenderService::asyncSetSinkNotificationConfiguration(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_NotificationConfiguration_s notificationConfiguration) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSinkNotificationConfiguration(handle, errorForHandle(handle), callStatus); } -void CAmRoutingSenderService::asyncSetSourceNotificationConfiguration(am_gen::am_handle_t handle, am_gen::am_sourceID_t sourceID, am_gen::am_NotificationConfiguration_s notificationConfiguration) { +void CAmRoutingSenderService::asyncSetSourceNotificationConfiguration(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_NotificationConfiguration_s notificationConfiguration) { logInfo(__FUNCTION__, " called"); CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->ackSourceNotificationConfiguration(handle, errorForHandle(handle), callStatus); |