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 /PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp | |
parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
download | audiomanager-d242d3f68b28f3856f72a3b3f64a339cebb686ba.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 'PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp')
-rw-r--r-- | PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp b/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp index 94b68a1..44c1b35 100644 --- a/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp +++ b/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp @@ -69,7 +69,7 @@ am_Error_e rs_lookupData_s::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, - const am_ConnectionFormat_e connectionFormat, + const am_CustomConnectionFormat_t connectionFormat, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback callback) { logInfo(__PRETTY_FUNCTION__, " [ isConnected : ", isConnected(), " ]"); @@ -81,7 +81,7 @@ am_Error_e rs_lookupData_s::asyncConnect(const am_Handle_s handle, static_cast<org::genivi::am::am_connectionID_t>(connectionID), static_cast<org::genivi::am::am_sourceID_t>(sourceID), static_cast<org::genivi::am::am_sinkID_t>(sinkID), - static_cast<org::genivi::am::am_ConnectionFormat_pe>(connectionFormat), + static_cast<org::genivi::am::am_CustomConnectionFormat_t>(connectionFormat), callback); return (E_OK); } @@ -108,7 +108,7 @@ am_Error_e rs_lookupData_s::asyncDisconnect(const am_Handle_s handle, am_Error_e rs_lookupData_s::asyncSetSinkVolume( const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, - const am_RampType_e ramp, + const am_CustomRampType_t ramp, const am_time_t time, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback cb) { @@ -120,7 +120,7 @@ am_Error_e rs_lookupData_s::asyncSetSinkVolume( const am_Handle_s handle, mSenderProxy->asyncSetSinkVolumeAsync(myHandle, static_cast<org::genivi::am::am_sinkID_t>(sinkID), static_cast<org::genivi::am::am_volume_t>(volume), - static_cast<org::genivi::am::am_RampType_pe>(ramp), + static_cast<org::genivi::am::am_CustomRampType_t>(ramp), static_cast<org::genivi::am::am_time_t>(time), cb); return (E_OK); @@ -131,7 +131,7 @@ am_Error_e rs_lookupData_s::asyncSetSinkVolume( const am_Handle_s handle, am_Error_e rs_lookupData_s::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, - const am_RampType_e ramp, + const am_CustomRampType_t ramp, const am_time_t time, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback cb) { @@ -143,7 +143,7 @@ am_Error_e rs_lookupData_s::asyncSetSourceVolume(const am_Handle_s handle, mSenderProxy->asyncSetSourceVolumeAsync(myHandle, static_cast<org::genivi::am::am_sourceID_t>(sourceID), static_cast<org::genivi::am::am_volume_t>(volume), - static_cast<org::genivi::am::am_RampType_pe>(ramp), + static_cast<org::genivi::am::am_CustomRampType_t>(ramp), static_cast<org::genivi::am::am_time_t>(time), cb); return (E_OK); @@ -258,7 +258,7 @@ am_Error_e rs_lookupData_s::asyncSetSourceSoundProperty(const am_Handle_s handle am_Error_e rs_lookupData_s::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, - const am_RampType_e rampType, + const am_CustomRampType_t rampType, const am_time_t time, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback cb) { @@ -270,7 +270,7 @@ am_Error_e rs_lookupData_s::asyncCrossFade(const am_Handle_s handle, mSenderProxy->asyncCrossFadeAsync(myHandle, static_cast<org::genivi::am::am_crossfaderID_t>(crossfaderID), static_cast<org::genivi::am::am_HotSink_e>(hotSink), - static_cast<org::genivi::am::am_RampType_pe>(rampType), + static_cast<org::genivi::am::am_CustomRampType_t>(rampType), static_cast<org::genivi::am::am_time_t>(time), cb); return (E_OK); @@ -490,7 +490,7 @@ am_Error_e CAmLookupData::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, - const am_ConnectionFormat_e connectionFormat, + const am_CustomConnectionFormat_t connectionFormat, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback callback) { RSLookupDataPtr result = CAmLookupData::getValueForKey(sourceID, mMapSources); @@ -522,7 +522,7 @@ am_Error_e CAmLookupData::asyncDisconnect(const am_Handle_s handle, am_Error_e CAmLookupData::asyncSetSinkVolume( const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, - const am_RampType_e ramp, + const am_CustomRampType_t ramp, const am_time_t time, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback cb) { @@ -538,7 +538,7 @@ am_Error_e CAmLookupData::asyncSetSinkVolume( const am_Handle_s handle, am_Error_e CAmLookupData::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, - const am_RampType_e ramp, + const am_CustomRampType_t ramp, const am_time_t time, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback cb) { @@ -625,7 +625,7 @@ am_Error_e CAmLookupData::asyncSetSourceSoundProperty(const am_Handle_s handle, am_Error_e CAmLookupData::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, - const am_RampType_e rampType, + const am_CustomRampType_t rampType, const am_time_t time, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback cb) { |