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/CAmRoutingService.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 'PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp')
| -rw-r--r-- | PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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); |