diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/include')
4 files changed, 111 insertions, 117 deletions
diff --git a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h index c3bf93c..b46ba75 100644 --- a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h +++ b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h @@ -24,7 +24,7 @@ #include <memory> #include <CommonAPI/CommonAPI.h> #include "audiomanagertypes.h" -#include <org/genivi/audiomanager/RoutingSenderProxy.h> +#include <org/genivi/am/RoutingControlProxy.h> #ifdef UNIT_TEST #include "../test/IAmRoutingSenderBackdoor.h" //we need this for the unit test @@ -33,7 +33,6 @@ namespace am { using namespace CommonAPI; -using namespace org::genivi::audiomanager; /** A structure holding info for given domain. * For every domain a single instance is created which is used by the lookup methods. @@ -43,17 +42,17 @@ struct rs_lookupData_s { private: bool mIsConnected; //!< bool indicating whether the domain is reachable or not - std::shared_ptr<RoutingSenderProxy<>> mSenderProxy; //!< a pointer to the proxy object, which implements the connection out from AudioManager + std::shared_ptr<org::genivi::am::RoutingControlProxy<> > mSenderProxy; //!< a pointer to the proxy object, which implements the connection out from AudioManager CommonAPI::ProxyStatusEvent::Subscription mSubscription; //!< subscription for the proxy system events void onServiceStatusEvent(const CommonAPI::AvailabilityStatus& serviceStatus); //!< proxy status event callback public: - rs_lookupData_s(const std::shared_ptr<RoutingSenderProxy<> > & aProxy); + rs_lookupData_s(const std::shared_ptr<org::genivi::am::RoutingControlProxy<> > & aProxy); ~rs_lookupData_s(); /** * returns the proxy object. */ - std::shared_ptr<RoutingSenderProxy<>> & getProxy(); + std::shared_ptr<org::genivi::am::RoutingControlProxy<>> & getProxy(); /** * returns whether the proxy object is connected or not. */ @@ -61,21 +60,21 @@ public: /** * proxy wrapping methods. */ - am_Error_e asyncAbort(const uint16_t handle, RoutingSenderProxyBase::AsyncAbortAsyncCallback); - am_Error_e asyncConnect(const uint16_t handle, const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_ConnectionFormat_e, RoutingSenderProxyBase::AsyncConnectAsyncCallback); - am_Error_e asyncDisconnect(const uint16_t handle, const am_connectionID_t, RoutingSenderProxyBase::AsyncDisconnectAsyncCallback); - am_Error_e asyncSetSinkVolume(const uint16_t handle, const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, RoutingSenderProxyBase::AsyncSetSinkVolumeAsyncCallback); - am_Error_e asyncSetSourceVolume(const uint16_t handle, const am_sourceID_t , const am_volume_t, const am_RampType_e, const am_time_t, RoutingSenderProxyBase::AsyncSetSourceVolumeAsyncCallback); - am_Error_e asyncSetSourceState(const uint16_t handle, const am_sourceID_t, const am_SourceState_e, RoutingSenderProxyBase::AsyncSetSourceStateAsyncCallback); - am_Error_e asyncSetSinkSoundProperties(const uint16_t handle, const am_sinkID_t, const std::vector<am_SoundProperty_s>&, RoutingSenderProxyBase::AsyncSetSinkSoundPropertiesAsyncCallback); - am_Error_e asyncSetSinkSoundProperty(const uint16_t handle, const am_sinkID_t, const am_SoundProperty_s&, RoutingSenderProxyBase::AsyncSetSinkSoundPropertyAsyncCallback); - am_Error_e asyncSetSourceSoundProperties(const uint16_t handle, const am_sourceID_t, const std::vector<am_SoundProperty_s>&, RoutingSenderProxyBase::AsyncSetSourceSoundPropertiesAsyncCallback); - am_Error_e asyncSetSourceSoundProperty(const uint16_t handle, const am_sourceID_t, const am_SoundProperty_s&, RoutingSenderProxyBase::AsyncSetSourceSoundPropertyAsyncCallback); - am_Error_e asyncCrossFade(const uint16_t handle, const am_crossfaderID_t, const am_HotSink_e, const am_RampType_e, const am_time_t, RoutingSenderProxyBase::AsyncCrossFadeAsyncCallback); - am_Error_e setDomainState(const am_domainID_t, const am_DomainState_e, RoutingSenderProxyBase::SetDomainStateAsyncCallback); - am_Error_e asyncSetVolumes(const uint16_t handle, const std::vector<am_Volumes_s>&, RoutingSenderProxyBase::AsyncSetVolumesAsyncCallback); - am_Error_e asyncSetSinkNotificationConfiguration(const uint16_t handle, const am_sinkID_t, const am_NotificationConfiguration_s&, RoutingSenderProxyBase::AsyncSetSinkNotificationConfigurationAsyncCallback); - am_Error_e asyncSetSourceNotificationConfiguration(const uint16_t handle, const am_sourceID_t, const am_NotificationConfiguration_s&, RoutingSenderProxyBase::AsyncSetSourceNotificationConfigurationAsyncCallback); + am_Error_e asyncAbort(const am_Handle_s handle, org::genivi::am::RoutingControlProxyBase::AsyncAbortAsyncCallback); + am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_ConnectionFormat_e, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback); + am_Error_e asyncDisconnect(const am_Handle_s handle, const am_connectionID_t, org::genivi::am::RoutingControlProxyBase::AsyncDisconnectAsyncCallback); + am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback); + am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t , const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback); + am_Error_e asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t, const am_SourceState_e, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceStateAsyncCallback); + am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertiesAsyncCallback); + am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertyAsyncCallback); + am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertiesAsyncCallback); + am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertyAsyncCallback); + am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t, const am_HotSink_e, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback); + am_Error_e setDomainState(const am_domainID_t, const am_DomainState_e, org::genivi::am::RoutingControlProxyBase::SetDomainStateAsyncCallback); + am_Error_e asyncSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetVolumesAsyncCallback); + am_Error_e asyncSetSinkNotificationConfiguration(const am_Handle_s handle, const am_sinkID_t, const am_NotificationConfiguration_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkNotificationConfigurationAsyncCallback); + am_Error_e asyncSetSourceNotificationConfiguration(const am_Handle_s handle, const am_sourceID_t, const am_NotificationConfiguration_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceNotificationConfigurationAsyncCallback); }; @@ -125,12 +124,12 @@ public: * @param aProxy is a proxy object constructed by registerDomain */ void addDomainLookup(am_domainID_t & domainID, - std::shared_ptr<RoutingSenderProxy<>> & aProxy); + std::shared_ptr<org::genivi::am::RoutingControlProxy<>> & aProxy); /** \brief removes given handle from the list. * */ - void removeHandle(uint16_t handle); + void removeHandle(am_Handle_s handle); /** \brief adds a lookup for given source in a given domain. * @@ -180,21 +179,21 @@ public: /** * Wrapping methods. */ - am_Error_e asyncAbort(const uint16_t, RoutingSenderProxyBase::AsyncAbortAsyncCallback); - am_Error_e asyncConnect(const uint16_t , const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_ConnectionFormat_e, RoutingSenderProxyBase::AsyncConnectAsyncCallback); - am_Error_e asyncDisconnect(const uint16_t , const am_connectionID_t, RoutingSenderProxyBase::AsyncDisconnectAsyncCallback); - am_Error_e asyncSetSinkVolume(const uint16_t , const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, RoutingSenderProxyBase::AsyncSetSinkVolumeAsyncCallback); - am_Error_e asyncSetSourceVolume(const uint16_t , const am_sourceID_t , const am_volume_t, const am_RampType_e, const am_time_t, RoutingSenderProxyBase::AsyncSetSourceVolumeAsyncCallback); - am_Error_e asyncSetSourceState(const uint16_t , const am_sourceID_t, const am_SourceState_e, RoutingSenderProxyBase::AsyncSetSourceStateAsyncCallback); - am_Error_e asyncSetSinkSoundProperties(const uint16_t , const am_sinkID_t, const std::vector<am_SoundProperty_s>&, RoutingSenderProxyBase::AsyncSetSinkSoundPropertiesAsyncCallback); - am_Error_e asyncSetSinkSoundProperty(const uint16_t , const am_sinkID_t, const am_SoundProperty_s&, RoutingSenderProxyBase::AsyncSetSinkSoundPropertyAsyncCallback); - am_Error_e asyncSetSourceSoundProperties(const uint16_t , const am_sourceID_t, const std::vector<am_SoundProperty_s>&, RoutingSenderProxyBase::AsyncSetSourceSoundPropertiesAsyncCallback); - am_Error_e asyncSetSourceSoundProperty(const uint16_t , const am_sourceID_t, const am_SoundProperty_s&, RoutingSenderProxyBase::AsyncSetSourceSoundPropertyAsyncCallback); - am_Error_e asyncCrossFade(const uint16_t , const am_crossfaderID_t, const am_HotSink_e, const am_RampType_e, const am_time_t, RoutingSenderProxyBase::AsyncCrossFadeAsyncCallback); - am_Error_e setDomainState(const am_domainID_t, const am_DomainState_e, RoutingSenderProxyBase::SetDomainStateAsyncCallback); - am_Error_e asyncSetVolumes(const uint16_t , const std::vector<am_Volumes_s>&, RoutingSenderProxyBase::AsyncSetVolumesAsyncCallback); - am_Error_e asyncSetSinkNotificationConfiguration(const uint16_t , const am_sinkID_t, const am_NotificationConfiguration_s&, RoutingSenderProxyBase::AsyncSetSinkNotificationConfigurationAsyncCallback); - am_Error_e asyncSetSourceNotificationConfiguration(const uint16_t , const am_sourceID_t, const am_NotificationConfiguration_s&, RoutingSenderProxyBase::AsyncSetSourceNotificationConfigurationAsyncCallback); + am_Error_e asyncAbort(const am_Handle_s, org::genivi::am::RoutingControlProxyBase::AsyncAbortAsyncCallback); + am_Error_e asyncConnect(const am_Handle_s , const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_ConnectionFormat_e, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback); + am_Error_e asyncDisconnect(const am_Handle_s , const am_connectionID_t, org::genivi::am::RoutingControlProxyBase::AsyncDisconnectAsyncCallback); + am_Error_e asyncSetSinkVolume(const am_Handle_s , const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback); + am_Error_e asyncSetSourceVolume(const am_Handle_s , const am_sourceID_t , const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback); + am_Error_e asyncSetSourceState(const am_Handle_s , const am_sourceID_t, const am_SourceState_e, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceStateAsyncCallback); + am_Error_e asyncSetSinkSoundProperties(const am_Handle_s , const am_sinkID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertiesAsyncCallback); + am_Error_e asyncSetSinkSoundProperty(const am_Handle_s , const am_sinkID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertyAsyncCallback); + am_Error_e asyncSetSourceSoundProperties(const am_Handle_s , const am_sourceID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertiesAsyncCallback); + am_Error_e asyncSetSourceSoundProperty(const am_Handle_s , const am_sourceID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertyAsyncCallback); + am_Error_e asyncCrossFade(const am_Handle_s , const am_crossfaderID_t, const am_HotSink_e, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback); + am_Error_e setDomainState(const am_domainID_t, const am_DomainState_e, org::genivi::am::RoutingControlProxyBase::SetDomainStateAsyncCallback); + am_Error_e asyncSetVolumes(const am_Handle_s , const std::vector<am_Volumes_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetVolumesAsyncCallback); + am_Error_e asyncSetSinkNotificationConfiguration(const am_Handle_s , const am_sinkID_t, const am_NotificationConfiguration_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkNotificationConfigurationAsyncCallback); + am_Error_e asyncSetSourceNotificationConfiguration(const am_Handle_s , const am_sourceID_t, const am_NotificationConfiguration_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceNotificationConfigurationAsyncCallback); #ifdef UNIT_TEST friend class IAmRoutingSenderBackdoor; #endif diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h index dc7f081..272b962 100644 --- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h +++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h @@ -30,14 +30,12 @@ namespace am { using namespace CommonAPI; -using namespace org::genivi::audiomanager; #define ROUTING_NODE "routinginterface" class CAmRoutingSenderCAPI: public IAmRoutingSend { bool mIsServiceStarted; - bool mReady; ///< bool indicating whether the plugin have got CAmLookupData mLookupData; ///< an object which implements the lookup mechanism CAmCommonAPIWrapper *mpCAmCAPIWrapper; ///< pointer to the common-api wrapper IAmRoutingReceive *mpIAmRoutingReceive; ///< pointer to the routing receive interface diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h index 63c9ea8..e30f18f 100644 --- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h +++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h @@ -20,40 +20,42 @@ #include <memory> #include "audiomanagertypes.h" -#include <org/genivi/audiomanager/am_gen.h> +#include <org/genivi/am.h> using namespace am; -using namespace org::genivi::audiomanager; using namespace CommonAPI; /** * Utility functions */ -extern void CAmConvertCAPI2AM(const am_gen::am_Domain_s &, am_Domain_s &); -extern void CAmConvertCAPI2AM(const am_gen::sourceData_s & , am::am_Source_s & ); -extern void CAmConvertCAPI2AM(const am_gen::sinkData_s & , am::am_Sink_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_Availability_s & , am_Availability_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_SoundProperty_s &, am::am_SoundProperty_s &); -extern void CAmConvertCAPI2AM(const am_gen::am_MainSoundProperty_s &, am::am_MainSoundProperty_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_NotificationConfiguration_s & , am::am_NotificationConfiguration_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_Gateway_s & , am::am_Gateway_s & ); -extern void CAmConvertCAPI2AM(const am_gen::crossfaderData_s & , am::am_Crossfader_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_EarlyData_s & , am::am_EarlyData_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_EarlyData_u &, am::am_EarlyData_u & ); -extern void CAmConvertCAPI2AM(const am_gen::am_DataType_u & , am::am_DataType_u & ); -extern void CAmConvertCAPI2AM(const am_gen::am_Volumes_s &, am::am_Volumes_s &); -extern void CAmConvertCAPI2AM(const am_gen::notificationPayload_s & , am::am_NotificationPayload_s & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_NotificationConfiguration_s> & , std::vector<am::am_NotificationConfiguration_s> & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_SoundProperty_s> &, std::vector<am::am_SoundProperty_s> &); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_ConnectionFormat_e> &, std::vector<am::am_ConnectionFormat_e> & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_MainSoundProperty_s> &, std::vector<am::am_MainSoundProperty_s> & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_Volumes_s> &, std::vector<am::am_Volumes_s> & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Domain_s &, am_Domain_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Source_s & , am::am_Source_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Sink_s & , am::am_Sink_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Availability_s & , am_Availability_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_SoundProperty_s &, am::am_SoundProperty_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_MainSoundProperty_s &, am::am_MainSoundProperty_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationConfiguration_s & , am::am_NotificationConfiguration_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Gateway_s & , am::am_Gateway_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Crossfader_s & , am::am_Crossfader_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_EarlyData_s & , am::am_EarlyData_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_EarlyData_u &, am::am_EarlyData_u & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_DataType_u & , am::am_DataType_u & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Volumes_s &, am::am_Volumes_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Handle_s &, am::am_Handle_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationPayload_s & , am::am_NotificationPayload_s & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_NotificationConfiguration_s> & , std::vector<am::am_NotificationConfiguration_s> & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_SoundProperty_s> &, std::vector<am::am_SoundProperty_s> &); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_ConnectionFormat_pe> &, std::vector<am::am_ConnectionFormat_e> & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_MainSoundProperty_s> &, std::vector<am::am_MainSoundProperty_s> & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_Volumes_s> &, std::vector<am::am_Volumes_s> & ); +extern void CAmConvertCAPIVector2AM(const org::genivi::am::am_EarlyData_L &, std::vector<am::am_EarlyData_s> &); -extern void CAmConvertAM2CAPI(const am_Availability_s & , am_gen::am_Availability_s & ); -extern void CAmConvertAM2CAPI(const am::am_SoundProperty_s &, am_gen::am_SoundProperty_s &); -extern void CAmConvertAM2CAPI(const am::am_NotificationConfiguration_s &, am_gen::am_NotificationConfiguration_s &); -extern void CAmConvertAM2CAPI(const am::am_Volumes_s &, am_gen::am_Volumes_s &); -extern void CAmConvertAMVector2CAPI(const std::vector<am::am_SoundProperty_s> &, std::vector<am_gen::am_SoundProperty_s> &); -extern void CAmConvertAMVector2CAPI(const std::vector<am::am_Volumes_s> & , std::vector<am_gen::am_Volumes_s> & ); +extern void CAmConvertAM2CAPI(const am_Availability_s & , org::genivi::am::am_Availability_s & ); +extern void CAmConvertAM2CAPI(const am::am_SoundProperty_s &, org::genivi::am::am_SoundProperty_s &); +extern void CAmConvertAM2CAPI(const am::am_NotificationConfiguration_s &, org::genivi::am::am_NotificationConfiguration_s &); +extern void CAmConvertAM2CAPI(const am::am_Volumes_s &, org::genivi::am::am_Volumes_s &); +extern void CAmConvertAMVector2CAPI(const std::vector<am::am_SoundProperty_s> &, std::vector<org::genivi::am::am_SoundProperty_s> &); +extern void CAmConvertAMVector2CAPI(const std::vector<am::am_Volumes_s> & , std::vector<org::genivi::am::am_Volumes_s> & ); +extern void CAmConvertAM2CAPI(const am::am_Handle_s &, org::genivi::am::am_Handle_s &); #endif /* CAMROUTINGSENDERCOMMON_H_ */ diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h index d4d1382..1018708 100644 --- a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h +++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h @@ -18,7 +18,7 @@ #ifndef CAMROUTINGSERVICE_H_ #define CAMROUTINGSERVICE_H_ -#include <org/genivi/audiomanager/RoutingInterfaceStubDefault.h> +#include <org/genivi/am/RoutingControlObserverStubDefault.h> #include "../../include/routing/IAmRoutingReceive.h" #include "CAmLookupData.h" @@ -27,12 +27,11 @@ namespace am { class CAmCommonAPIWrapper; using namespace CommonAPI; -using namespace org::genivi::audiomanager; /** Routing interface stub implementation. * This class is the routing interface service for the Audio Manager. */ -class CAmRoutingService: public RoutingInterfaceStubDefault { +class CAmRoutingService: public org::genivi::am::RoutingControlObserverStubDefault { CAmCommonAPIWrapper *mpCAmCAPIWrapper; ///< pointer to common-api wrapper IAmRoutingReceive* mpIAmRoutingReceive; ///< pointer to the routing receive interface CAmLookupData* mpLookpData; ///< pointer to the plugin's lookup mechanism implementation @@ -50,98 +49,94 @@ public: * */ - virtual void ackConnect(uint16_t handle, am_gen::am_connectionID_t connectionID, uint16_t error); + void ackConnect(org::genivi::am::am_Handle_s handle, org::genivi::am::am_connectionID_t connectionID, org::genivi::am::am_Error_e error); - virtual void ackDisconnect(uint16_t handle, am_gen::am_connectionID_t connectionID, uint16_t error); + void ackDisconnect(org::genivi::am::am_Handle_s handle, org::genivi::am::am_connectionID_t connectionID, org::genivi::am::am_Error_e error); - virtual void ackSetSinkVolume(uint16_t handle, am_gen::am_volume_t volume, uint16_t error); + void ackSetSinkVolumeChange(org::genivi::am::am_Handle_s handle, org::genivi::am::am_volume_t volume, org::genivi::am::am_Error_e error); - virtual void ackSetSourceVolume(uint16_t handle, am_gen::am_volume_t volume, uint16_t error); + void ackSetSourceVolumeChange(org::genivi::am::am_Handle_s handle, org::genivi::am::am_volume_t volume, org::genivi::am::am_Error_e error); - virtual void ackSetSourceState(uint16_t handle, uint16_t error); + void ackSetSourceState(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackSetSinkSoundProperties(uint16_t handle, uint16_t error); + void ackSetSinkSoundProperties(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackSetSinkSoundProperty(uint16_t handle, uint16_t error); + void ackSetSinkSoundProperty(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackSetSourceSoundProperties(uint16_t handle, uint16_t error); + void ackSetSourceSoundProperties(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackSetSourceSoundProperty(uint16_t handle, uint16_t error); + void ackSetSourceSoundProperty(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackCrossFading(uint16_t handle, am_gen::am_HotSink_e hotSink, am_gen::am_Error_e returnError); + void ackCrossFading(org::genivi::am::am_Handle_s handle, org::genivi::am::am_HotSink_e hotSink, org::genivi::am::am_Error_e error); - virtual void ackSourceVolumeTick(uint16_t handle, am_gen::am_sourceID_t source, am_gen::am_volume_t volume); + void ackSourceVolumeTick(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sourceID_t source, org::genivi::am::am_volume_t volume); - virtual void ackSinkVolumeTick(uint16_t handle, am_gen::am_sinkID_t sink, am_gen::am_volume_t volume); + void ackSinkVolumeTick(org::genivi::am::am_Handle_s handle, org::genivi::am::am_sinkID_t sink, org::genivi::am::am_volume_t volume); - virtual void peekDomain(std::string name, am_gen::am_domainID_t& domainID, am_gen::am_Error_e& error); + void peekDomain(std::string name, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error); - virtual void registerDomain(am_gen::am_Domain_s domainData, std::string returnBusname, std::string returnPath, std::string returnInterface, am_gen::am_domainID_t& domainID, am_gen::am_Error_e& error); + void registerDomain(org::genivi::am::am_Domain_s domainData, std::string returnBusname, std::string, std::string returnInterface, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error); - virtual void deregisterDomain(am_gen::am_domainID_t domainID, am_gen::am_Error_e& returnError); + void deregisterDomain(org::genivi::am::am_domainID_t domainID, org::genivi::am::am_Error_e& returnError); - virtual void registerGateway(am_gen::am_Gateway_s gatewayData, am_gen::am_gatewayID_t& gatewayID, am_gen::am_Error_e& error); + void registerGateway(org::genivi::am::am_Gateway_s gatewayData, org::genivi::am::am_gatewayID_t& gatewayID, org::genivi::am::am_Error_e& error); - virtual void deregisterGateway(am_gen::am_gatewayID_t gatewayID, am_gen::am_Error_e& returnError); + void deregisterGateway(org::genivi::am::am_gatewayID_t gatewayID, org::genivi::am::am_Error_e& returnError); - virtual void peekSink(std::string name, am_gen::am_sinkID_t& sinkID, am_gen::am_Error_e& error); + void peekSink(std::string name, org::genivi::am::am_sinkID_t& sinkID, org::genivi::am::am_Error_e& error); - virtual void registerSink(am_gen::sinkData_s sinkData, am_gen::am_sinkID_t& sinkID, am_gen::am_Error_e& error); + void registerSink(org::genivi::am::am_Sink_s sinkData, org::genivi::am::am_sinkID_t& sinkID, org::genivi::am::am_Error_e& error); - virtual void deregisterSink(am_gen::am_sinkID_t sinkID, am_gen::am_Error_e& returnError); + void deregisterSink(org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_Error_e& returnError); - virtual void peekSource(std::string name, am_gen::am_sourceID_t& sourceID, am_gen::am_Error_e& error); + void peekSource(std::string name, org::genivi::am::am_sourceID_t& sourceID, org::genivi::am::am_Error_e& error); - virtual void registerSource(am_gen::sourceData_s sourceData, am_gen::am_sourceID_t& sourceID, am_gen::am_Error_e& error); + void registerSource(org::genivi::am::am_Source_s sourceData, org::genivi::am::am_sourceID_t& sourceID, org::genivi::am::am_Error_e& error); - virtual void deregisterSource(am_gen::am_sourceID_t sourceID, am_gen::am_Error_e& returnError); + void deregisterSource(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_Error_e& returnError); - virtual void registerCrossfader(am_gen::crossfaderData_s crossfaderData, am_gen::am_crossfaderID_t& crossfaderID, am_gen::am_Error_e& error); + void registerCrossfader(org::genivi::am::am_Crossfader_s crossfaderData, org::genivi::am::am_crossfaderID_t& crossfaderID, org::genivi::am::am_Error_e& error); - virtual void deregisterCrossfader(am_gen::am_crossfaderID_t crossfaderID, am_gen::am_Error_e& returnError); + void deregisterCrossfader(org::genivi::am::am_crossfaderID_t crossfaderID, org::genivi::am::am_Error_e& returnError); - virtual void peekSourceClassID(std::string name, am_gen::am_sourceClass_t& sourceClassID, am_gen::am_Error_e& error); + void peekSourceClassID(std::string name, org::genivi::am::am_sourceClass_t& sourceClassID, org::genivi::am::am_Error_e& error); - virtual void peekSinkClassID(std::string name, am_gen::am_sinkClass_t& sinkClassID, am_gen::am_Error_e& error); + void peekSinkClassID(std::string name, org::genivi::am::am_sinkClass_t& sinkClassID, org::genivi::am::am_Error_e& error); - virtual void hookInterruptStatusChange(am_gen::am_sourceID_t sourceID, uint16_t interruptState); + void hookInterruptStatusChange(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_InterruptState_e InterruptState); - virtual void hookDomainRegistrationComplete(am_gen::am_domainID_t domainID); + void hookDomainRegistrationComplete(org::genivi::am::am_domainID_t domainID); - virtual void hookSinkAvailablityStatusChange(am_gen::am_sinkID_t sinkID, am_gen::am_Availability_s availability); + void hookSinkAvailablityStatusChange(org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_Availability_s availability); - virtual void hookSourceAvailablityStatusChange(am_gen::am_sourceID_t sourceID, am_gen::am_Availability_s availability); + void hookSourceAvailablityStatusChange(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_Availability_s availability); - virtual void hookDomainStateChange(am_gen::am_domainID_t domainID, am_gen::am_DomainState_e domainState); + void hookDomainStateChange(org::genivi::am::am_domainID_t domainID, org::genivi::am::am_DomainState_e domainState); - virtual void hookTimingInformationChanged(am_gen::am_connectionID_t connectionID, int16_t delay); + void hookTimingInformationChanged(org::genivi::am::am_connectionID_t connectionID, int16_t delay); - virtual void sendChangedData(am_gen::am_EarlyData_l earlyData_volumes, am_gen::am_EarlyData_l earlyData_soundproperties); + void sendChangedData(org::genivi::am::am_EarlyData_L earlyData); - virtual void confirmRoutingReady(am_gen::am_domainID_t domainID); + void updateGateway(org::genivi::am::am_gatewayID_t gatewayID, org::genivi::am::am_ConnectionFormat_L listSourceFormats, org::genivi::am::am_ConnectionFormat_L listSinkFormats, org::genivi::am::am_Convertion_L convertionMatrix, org::genivi::am::am_Error_e& error); - virtual void confirmRoutingRundown(am_gen::am_domainID_t domainID); + void updateSink(org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_sinkClass_t sinkClassID, org::genivi::am::am_SoundProperty_L listSoundProperties, org::genivi::am::am_ConnectionFormat_L listConnectionFormats, org::genivi::am::am_MainSoundProperty_L listMainSoundProperties, org::genivi::am::am_Error_e& error); - virtual void updateGateway(am_gen::am_gatewayID_t gatewayID, am_gen::am_ConnectionFormat_L listSourceFormats, am_gen::am_ConnectionFormat_L listSinkFormats, am_gen::bool_L convertionMatrix); + void updateSource(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_sourceClass_t sourceClassID, org::genivi::am::am_SoundProperty_L listSoundProperties, org::genivi::am::am_ConnectionFormat_L listConnectionFormats, org::genivi::am::am_MainSoundProperty_L listMainSoundProperties, org::genivi::am::am_Error_e& error); - virtual void updateSink(am_gen::am_sinkID_t sinkID, am_gen::am_sinkClass_t sinkClassID, am_gen::am_SoundProperty_L listSoundProperties, am_gen::am_ConnectionFormat_L listConnectionFormats, am_gen::am_MainSoundProperty_L listMainSoundProperties); + void ackSetVolumes(org::genivi::am::am_Handle_s handle , org::genivi::am::am_Volumes_L listVolumes, org::genivi::am::am_Error_e error); - virtual void updateSource(am_gen::am_sourceID_t sourceID, am_gen::am_sourceClass_t sourceClassID, am_gen::am_SoundProperty_L listSoundProperties, am_gen::am_ConnectionFormat_L listConnectionFormats, am_gen::am_MainSoundProperty_L listMainSoundProperties); + void ackSinkNotificationConfiguration (org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackSetVolumes(uint16_t handle, am_gen::am_Volumes_l listVolumes, uint16_t error); + void ackSourceNotificationConfiguration(org::genivi::am::am_Handle_s handle, org::genivi::am::am_Error_e error); - virtual void ackSinkNotificationConfiguration(uint16_t handle, uint16_t error); + void hookSinkNotificationDataChange(org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_NotificationPayload_s payload); - virtual void ackSourceNotificationConfiguration(uint16_t handle, uint16_t error); + void hookSourceNotificationDataChange(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_NotificationPayload_s payload); - virtual void hookSinkNotificationDataChange(am_gen::am_sinkID_t sinkID, am_gen::notificationPayload_s payload); + void confirmRoutingRundown(std::string domainName); - virtual void hookSourceNotificationDataChange(am_gen::am_sourceID_t sourceID, am_gen::notificationPayload_s payload); - - virtual void getRoutingReadyState(bool& readyState); - - void gotReady(int16_t numberDomains, uint16_t handle); void gotRundown(int16_t numberDomains, uint16_t handle); + }; } /* namespace am */ |