diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
| commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
| tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/src/CAmRoutingSender.cpp | |
| parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
| download | audiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz | |
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon/src/CAmRoutingSender.cpp')
| -rw-r--r-- | AudioManagerDaemon/src/CAmRoutingSender.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp index 5f7f03a..1606761 100644 --- a/AudioManagerDaemon/src/CAmRoutingSender.cpp +++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp @@ -202,7 +202,7 @@ am_Error_e CAmRoutingSender::asyncAbort(const am_Handle_s& handle) return (E_NON_EXISTENT); } -am_Error_e CAmRoutingSender::asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) +am_Error_e CAmRoutingSender::asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat) { am_handleData_c handleData; SinkInterfaceMap::iterator iter = mMapSinkInterface.begin(); @@ -236,7 +236,7 @@ am_Error_e CAmRoutingSender::asyncDisconnect(am_Handle_s& handle, const am_conne return (E_NON_EXISTENT); } -am_Error_e CAmRoutingSender::asyncSetSinkVolume(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 CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) { am_handleData_c handleData; SinkInterfaceMap::iterator iter = mMapSinkInterface.begin(); @@ -252,7 +252,7 @@ am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_si return (E_NON_EXISTENT); } -am_Error_e CAmRoutingSender::asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) +am_Error_e CAmRoutingSender::asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) { am_handleData_c handleData; SourceInterfaceMap::iterator iter = mMapSourceInterface.begin(); @@ -349,7 +349,7 @@ am_Error_e CAmRoutingSender::asyncSetSinkSoundProperties(am_Handle_s& handle, co } -am_Error_e CAmRoutingSender::asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time) +am_Error_e CAmRoutingSender::asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time) { am_handleData_c handleData; CrossfaderInterfaceMap::iterator iter = mMapCrossfaderInterface.begin(); |