diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/src')
4 files changed, 33 insertions, 33 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) { diff --git a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp index b05fcc0..207437b 100644 --- a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp +++ b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp @@ -144,7 +144,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncAbort(const am_Handle_s handle) }); } -am_Error_e CAmRoutingSenderCAPI::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) +am_Error_e CAmRoutingSenderCAPI::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat) { log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncConnect called"); return mLookupData.asyncConnect(handle,connectionID, sourceID, sinkID, connectionFormat, [&,handle,connectionID](const CommonAPI::CallStatus& callStatus){ @@ -172,7 +172,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncDisconnect(const am_Handle_s handle, const }); } -am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const 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 CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) { log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSinkVolume called"); return mLookupData.asyncSetSinkVolume(handle,sinkID, volume, ramp, time, [&, handle, volume](const CommonAPI::CallStatus& callStatus){ @@ -186,7 +186,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, co }); } -am_Error_e CAmRoutingSenderCAPI::asyncSetSourceVolume(const 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 CAmRoutingSenderCAPI::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) { log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceVolume called"); return mLookupData.asyncSetSourceVolume(handle,sourceID, volume, ramp, time, [&, handle, volume](const CommonAPI::CallStatus& callStatus){ @@ -270,7 +270,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSourceSoundProperty(const am_Handle_s h }); } -am_Error_e CAmRoutingSenderCAPI::asyncCrossFade(const 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 CAmRoutingSenderCAPI::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time) { return mLookupData.asyncCrossFade(handle, crossfaderID, hotSink, rampType, time, [&, handle, hotSink](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast<int16_t>(callStatus)); diff --git a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp index e90c75a..68d360d 100644 --- a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp +++ b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp @@ -35,7 +35,7 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_Domain_s & source, am::am_Domai void CAmConvertCAPI2AM(const org::genivi::am::am_SoundProperty_s & source, am::am_SoundProperty_s & destination) { - destination.type = static_cast<am::am_SoundPropertyType_e>(source.type); + destination.type = static_cast<am::am_CustomSoundPropertyType_t>(source.type); destination.value = source.value; } @@ -52,14 +52,14 @@ void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_SoundProperty void CAmConvertCAPI2AM(const org::genivi::am::am_MainSoundProperty_s & source, am::am_MainSoundProperty_s & destination) { - destination.type = static_cast<am::am_MainSoundPropertyType_e>(source.type); + destination.type = static_cast<am::am_CustomMainSoundPropertyType_t>(source.type); destination.value = source.value; } void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationPayload_s & source, am::am_NotificationPayload_s & destination) { - destination.type = static_cast<am::am_NotificationType_e>(source.type); + destination.type = static_cast<am::am_CustomNotificationType_t>(source.type); destination.value = source.value; } @@ -87,7 +87,7 @@ void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_MainSoundProp void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationConfiguration_s & source, am::am_NotificationConfiguration_s & destination) { - destination.type = static_cast<am::am_NotificationType_e>(source.type); + destination.type = static_cast<am::am_CustomNotificationType_t>(source.type); destination.status = static_cast<am::am_NotificationStatus_e>(source.status); destination.parameter = source.parameter; } @@ -103,11 +103,11 @@ void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_NotificationC } } -void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_ConnectionFormat_pe> & source, std::vector<am::am_ConnectionFormat_e> & destination) +void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_CustomConnectionFormat_t> & source, std::vector<am::am_CustomConnectionFormat_t> & destination) { destination.clear(); - for(std::vector<org::genivi::am::am_ConnectionFormat_pe>::const_iterator iter = source.begin(); iter!=source.end(); ++iter) - destination.push_back(static_cast<am::am_ConnectionFormat_e>(*iter)); + for(std::vector<org::genivi::am::am_CustomConnectionFormat_t>::const_iterator iter = source.begin(); iter!=source.end(); ++iter) + destination.push_back(static_cast<am::am_CustomConnectionFormat_t>(*iter)); } @@ -154,7 +154,7 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_Volumes_s & source, am::am_Volu destination.volume = source.volume; destination.time = source.time; destination.volumeType = static_cast<am::am_VolumeType_e>(source.volumeType); - destination.ramp = static_cast<am::am_RampType_e>(source.ramp); + destination.ramp = static_cast<am::am_CustomRampType_t>(source.ramp); } @@ -224,7 +224,7 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_EarlyData_s & source, am::am_Ea void CAmConvertCAPI2AM(const org::genivi::am::am_Availability_s & source, am_Availability_s & destination) { destination.availability = static_cast<am_Availability_e>(source.availability); - destination.availabilityReason = static_cast<am_AvailabilityReason_e>(source.availabilityReason); + destination.availabilityReason = static_cast<am_CustomAvailabilityReason_t>(source.availabilityReason); } void CAmConvertCAPI2AM(const org::genivi::am::am_Handle_s& source, am_Handle_s& destination) @@ -236,12 +236,12 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_Handle_s& source, am_Handle_s& void CAmConvertAM2CAPI(const am_Availability_s & source, org::genivi::am::am_Availability_s & destination) { destination.availability = static_cast<org::genivi::am::am_Availability_e>(source.availability); - destination.availabilityReason = static_cast<org::genivi::am::am_AvailabilityReason_pe>(source.availabilityReason); + destination.availabilityReason = static_cast<org::genivi::am::am_CustomAvailabilityReason_t>(source.availabilityReason); } void CAmConvertAM2CAPI(const am::am_SoundProperty_s & source, org::genivi::am::am_SoundProperty_s & destination) { - destination.type = static_cast<org::genivi::am::am_SoundPropertyType_pe>(source.type); + destination.type = static_cast<org::genivi::am::am_CustomSoundPropertyType_t>(source.type); destination.value = source.value; } @@ -255,7 +255,7 @@ extern void CAmConvertAM2CAPI(const am::am_Handle_s& source, void CAmConvertAM2CAPI(const am::am_NotificationConfiguration_s & source, org::genivi::am::am_NotificationConfiguration_s & destination) { - destination.type = static_cast<org::genivi::am::am_NotificationType_pe>(source.type); + destination.type = static_cast<org::genivi::am::am_CustomNotificationType_t>(source.type); destination.status = static_cast<org::genivi::am::am_NotificationStatus_e>(source.status); destination.parameter = source.parameter; } @@ -268,7 +268,7 @@ void CAmConvertAM2CAPI(const am::am_Volumes_s & source, org::genivi::am::am_Volu destination.volumeID = org::genivi::am::am_DataType_u(static_cast<org::genivi::am::am_sourceID_t>(source.volumeID.source)); destination.volumeType = static_cast<org::genivi::am::am_VolumeType_e>(source.volumeType); destination.volume = static_cast<org::genivi::am::am_volume_t>(source.volume); - destination.ramp = static_cast<org::genivi::am::am_RampType_pe>(source.ramp); + destination.ramp = static_cast<org::genivi::am::am_CustomRampType_t>(source.ramp); destination.time = static_cast<org::genivi::am::am_time_t>(source.time); } diff --git a/PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp b/PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp index df9448c..b3fce38 100644 --- a/PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp +++ b/PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp @@ -304,10 +304,10 @@ void CAmRoutingService::sendChangedData(org::genivi::am::am_EarlyData_L earlyDat void CAmRoutingService::updateGateway(org::genivi::am::am_gatewayID_t gatewayID, org::genivi::am::am_ConnectionFormat_L listSourceFormats, org::genivi::am::am_ConnectionFormat_L listSinkFormats, org::genivi::am::am_Convertion_L convertionMatrix, org::genivi::am::am_Error_e& error) { assert(mpIAmRoutingReceive); - std::vector<am_ConnectionFormat_e> destinationSourceConnectionFormats; + std::vector<am_CustomConnectionFormat_t> destinationSourceConnectionFormats; CAmConvertCAPIVector2AM(listSourceFormats, destinationSourceConnectionFormats); - std::vector<am_ConnectionFormat_e> destinationSinkConnectionFormats; + std::vector<am_CustomConnectionFormat_t> destinationSinkConnectionFormats; CAmConvertCAPIVector2AM(listSinkFormats, destinationSinkConnectionFormats); mpIAmRoutingReceive->updateGateway(gatewayID, destinationSourceConnectionFormats, destinationSinkConnectionFormats, convertionMatrix); @@ -317,7 +317,7 @@ void CAmRoutingService::updateSink(org::genivi::am::am_sinkID_t sinkID, org::gen assert(mpIAmRoutingReceive); std::vector<am_SoundProperty_s> dstListSoundProperties; CAmConvertCAPIVector2AM(listSoundProperties, dstListSoundProperties); - std::vector<am_ConnectionFormat_e> dstListSinkConnectionFormats; + std::vector<am_CustomConnectionFormat_t> dstListSinkConnectionFormats; CAmConvertCAPIVector2AM(listConnectionFormats, dstListSinkConnectionFormats); std::vector<am_MainSoundProperty_s> dstListMainSoundProperties; CAmConvertCAPIVector2AM(listMainSoundProperties, dstListMainSoundProperties); @@ -328,7 +328,7 @@ void CAmRoutingService::updateSource(org::genivi::am::am_sourceID_t sourceID, or assert(mpIAmRoutingReceive); std::vector<am_SoundProperty_s> dstListSoundProperties; CAmConvertCAPIVector2AM(listSoundProperties, dstListSoundProperties); - std::vector<am_ConnectionFormat_e> dstListSinkConnectionFormats; + std::vector<am_CustomConnectionFormat_t> dstListSinkConnectionFormats; CAmConvertCAPIVector2AM(listConnectionFormats, dstListSinkConnectionFormats); std::vector<am_MainSoundProperty_s> dstListMainSoundProperties; CAmConvertCAPIVector2AM(listMainSoundProperties, dstListMainSoundProperties); |