diff options
| author | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-22 09:43:32 +0100 |
|---|---|---|
| committer | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-22 09:43:32 +0100 |
| commit | 065d7f02aef0dc9f7e4bbf2627dcf3dad7a3280c (patch) | |
| tree | 37d24bc497b6b467e8c8066a6c44fea36a6d8081 /AudioManagerDaemon/test/controlInterface/MockInterfaces.h | |
| parent | 9c209bd92d9400012765d86fc5bd51ddfe266071 (diff) | |
| parent | 479a20f551b66406a4a6770fe09d17e23d38ed14 (diff) | |
| download | audiomanager-065d7f02aef0dc9f7e4bbf2627dcf3dad7a3280c.tar.gz | |
Merge branch 'master' of qmuc300924:AudioManager
Diffstat (limited to 'AudioManagerDaemon/test/controlInterface/MockInterfaces.h')
| -rw-r--r-- | AudioManagerDaemon/test/controlInterface/MockInterfaces.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/AudioManagerDaemon/test/controlInterface/MockInterfaces.h b/AudioManagerDaemon/test/controlInterface/MockInterfaces.h index 746d70e..b49cae6 100644 --- a/AudioManagerDaemon/test/controlInterface/MockInterfaces.h +++ b/AudioManagerDaemon/test/controlInterface/MockInterfaces.h @@ -156,14 +156,15 @@ class MockControlSendInterface : public ControlSendInterface { void(const am_Handle_s handle, const am_Error_e error)); MOCK_METHOD2(cbAckSetSinkSoundProperty, void(const am_Handle_s handle, const am_Error_e error)); - MOCK_METHOD4(getConnectionFormatChoice, - am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats)); + MOCK_METHOD5(getConnectionFormatChoice, + am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats)); MOCK_CONST_METHOD0(getInterfaceVersion, uint16_t()); }; + } // namespace am |