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/test/MockIAmControlReceive.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'PluginControlInterface/test/MockIAmControlReceive.h') diff --git a/PluginControlInterface/test/MockIAmControlReceive.h b/PluginControlInterface/test/MockIAmControlReceive.h index 81e69da..eb116b1 100644 --- a/PluginControlInterface/test/MockIAmControlReceive.h +++ b/PluginControlInterface/test/MockIAmControlReceive.h @@ -30,19 +30,19 @@ class MockIAmControlReceive : public IAmControlReceive { MOCK_METHOD4(getRoute, am_Error_e(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector& returnList)); MOCK_METHOD5(connect, - am_Error_e(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)); + am_Error_e(am_Handle_s& handle, am_connectionID_t& connectionID, const am_CustomAvailabilityReason_t format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)); MOCK_METHOD2(disconnect, am_Error_e(am_Handle_s& handle, const am_connectionID_t connectionID)); MOCK_METHOD5(crossfade, - am_Error_e(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime)); + am_Error_e(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_CustomRampType_t rampType, const am_time_t rampTime)); MOCK_METHOD1(abortAction, am_Error_e(const am_Handle_s handle)); MOCK_METHOD3(setSourceState, am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state)); MOCK_METHOD5(setSinkVolume, - am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)); + am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)); MOCK_METHOD5(setSourceVolume, - am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time)); + am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t rampType, const am_time_t time)); MOCK_METHOD3(setSinkSoundProperties, am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const std::vector& soundProperty)); MOCK_METHOD3(setSinkSoundProperty, @@ -170,11 +170,11 @@ class MockIAmControlReceive : public IAmControlReceive { MOCK_METHOD1(getSocketHandler, am_Error_e(CAmSocketHandler*& socketHandler)); MOCK_METHOD5(changeSourceDB, - am_Error_e(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(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD5(changeSinkDB, - am_Error_e(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(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD4(changeGatewayDB, - am_Error_e(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix)); + am_Error_e(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix)); MOCK_METHOD2(setVolumes, am_Error_e(am_Handle_s& handle, const std::vector& listVolumes)); MOCK_METHOD3(setSinkNotificationConfiguration, -- cgit v1.2.1