From 20491c0f31d70e254c56f171c69b95f3d4ad2813 Mon Sep 17 00:00:00 2001 From: Jens Lorenz Date: Wed, 11 Jun 2014 18:14:58 +0200 Subject: * Bug #100 - removed projecttypes.h which causes compiling conflicts Signed-off-by: Jens Lorenz --- PluginControlInterface/include/CAmControlSenderBase.h | 8 ++++---- PluginControlInterface/include/IAmControlReceiverShadow.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'PluginControlInterface/include') diff --git a/PluginControlInterface/include/CAmControlSenderBase.h b/PluginControlInterface/include/CAmControlSenderBase.h index 82ee056..df2f9c9 100644 --- a/PluginControlInterface/include/CAmControlSenderBase.h +++ b/PluginControlInterface/include/CAmControlSenderBase.h @@ -69,15 +69,15 @@ public: void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error); void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error); void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error); - am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector listPossibleConnectionFormats, std::vector& listPrioConnectionFormats); + am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector listPossibleConnectionFormats, std::vector& listPrioConnectionFormats); void getInterfaceVersion(std::string& version) const; void confirmCommandReady(const am_Error_e error) ; void confirmRoutingReady(const am_Error_e error) ; void confirmCommandRundown(const am_Error_e error) ; void confirmRoutingRundown(const am_Error_e error) ; - am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; - am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; - am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) ; + am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) ; void cbAckSetVolumes(const am_Handle_s handle, const std::vector& listVolumes, const am_Error_e error) ; void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ; void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ; diff --git a/PluginControlInterface/include/IAmControlReceiverShadow.h b/PluginControlInterface/include/IAmControlReceiverShadow.h index ed8c774..2557836 100644 --- a/PluginControlInterface/include/IAmControlReceiverShadow.h +++ b/PluginControlInterface/include/IAmControlReceiverShadow.h @@ -35,13 +35,13 @@ public: IAmControlReceiverShadow(IAmControlReceive* iReceiveInterface, CAmSocketHandler* iSocketHandler); ~IAmControlReceiverShadow(); am_Error_e getRoute(bool onlyfree, am_sourceID_t sourceID, am_sinkID_t sinkID, std::vector& returnList); - am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, am_ConnectionFormat_e format, am_sourceID_t sourceID, am_sinkID_t sinkID); + am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, am_CustomConnectionFormat_t format, am_sourceID_t sourceID, am_sinkID_t sinkID); am_Error_e disconnect(am_Handle_s& handle, am_connectionID_t connectionID); - am_Error_e crossfade(am_Handle_s& handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_RampType_e rampType, am_time_t rampTime); + am_Error_e crossfade(am_Handle_s& handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_CustomRampType_t rampType, am_time_t rampTime); am_Error_e abortAction(am_Handle_s handle); am_Error_e setSourceState(am_Handle_s& handle, am_sourceID_t sourceID, am_SourceState_e state); - am_Error_e setSinkVolume(am_Handle_s& handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_e ramp, am_time_t time); - am_Error_e setSourceVolume(am_Handle_s& handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_e rampType, am_time_t time); + am_Error_e setSinkVolume(am_Handle_s& handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time); + am_Error_e setSourceVolume(am_Handle_s& handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t rampType, am_time_t time); am_Error_e setSinkSoundProperties(am_Handle_s& handle, am_sinkID_t sinkID, std::vector& soundProperty); am_Error_e setSinkSoundProperty(am_Handle_s& handle, am_sinkID_t sinkID, am_SoundProperty_s& soundProperty); am_Error_e setSourceSoundProperties(am_Handle_s& handle, am_sourceID_t sourceID, std::vector& soundProperty); -- cgit v1.2.1