From 20491c0f31d70e254c56f171c69b95f3d4ad2813 Mon Sep 17 00:00:00 2001 From: Jens Lorenz Date: Wed, 11 Jun 2014 18:14:58 +0200 Subject: * Bug #100 - removed projecttypes.h which causes compiling conflicts Signed-off-by: Jens Lorenz --- .../src/CAmCommandSenderService.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp') diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp index 552ff9a..d2d59f1 100644 --- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp +++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp @@ -65,19 +65,19 @@ void CAmCommandSenderService::setSinkMuteState(org::genivi::am::am_sinkID_t sink void CAmCommandSenderService::setMainSinkSoundProperty(org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_MainSoundProperty_s soundProperty, org::genivi::am::am_Error_e& result) { assert(mpIAmCommandReceive); - am_MainSoundProperty_s property = {static_cast(soundProperty.type), soundProperty.value}; + am_MainSoundProperty_s property = {static_cast(soundProperty.type), soundProperty.value}; result = CAmConvert2CAPIType(mpIAmCommandReceive->setMainSinkSoundProperty(property, sinkID)); } void CAmCommandSenderService::setMainSourceSoundProperty(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_MainSoundProperty_s soundProperty, org::genivi::am::am_Error_e& result) { assert(mpIAmCommandReceive); - am_MainSoundProperty_s property = {static_cast(soundProperty.type), soundProperty.value}; + am_MainSoundProperty_s property = {static_cast(soundProperty.type), soundProperty.value}; result = CAmConvert2CAPIType(mpIAmCommandReceive->setMainSourceSoundProperty(property, sourceID)); } void CAmCommandSenderService::setSystemProperty(org::genivi::am::am_SystemProperty_s soundProperty, org::genivi::am::am_Error_e& result) { assert(mpIAmCommandReceive); - am_SystemProperty_s property = {static_cast(soundProperty.type), soundProperty.value}; + am_SystemProperty_s property = {static_cast(soundProperty.type), soundProperty.value}; result = CAmConvert2CAPIType(mpIAmCommandReceive->setSystemProperty(property)); } @@ -147,7 +147,7 @@ void CAmCommandSenderService::getListMainSinkSoundProperties(org::genivi::am::am org::genivi::am::am_MainSoundProperty_s item; for(std::vector::const_iterator iter = list.begin(); iter!=list.end(); iter++) { - item.type = CAmConvert2CAPIType(iter->type); + item.type = iter->type; item.value = iter->value; listSoundProperties.push_back (item); } @@ -163,7 +163,7 @@ void CAmCommandSenderService::getListMainSourceSoundProperties(org::genivi::am:: org::genivi::am::am_MainSoundProperty_s item; for(std::vector::const_iterator iter = list.begin(); iter!=list.end(); iter++) { - item.type = CAmConvert2CAPIType(iter->type); + item.type = iter->type; item.value = iter->value; listSourceProperties.push_back (item); } @@ -183,7 +183,7 @@ void CAmCommandSenderService::getListSourceClasses(org::genivi::am::am_SourceCla item.name = iter->name; item.listClassProperties.clear(); std::for_each(iter->listClassProperties.begin(), iter->listClassProperties.end(), [&](const am_ClassProperty_s & ref) { - org::genivi::am::am_ClassProperty_s classProp(CAmConvert2CAPIType(ref.classProperty), ref.value); + org::genivi::am::am_ClassProperty_s classProp(ref.classProperty, ref.value); item.listClassProperties.push_back(classProp); }); listSourceClasses.push_back (item); @@ -204,7 +204,7 @@ void CAmCommandSenderService::getListSinkClasses(org::genivi::am::am_SinkClass_L item.name = iter->name; item.listClassProperties.clear(); std::for_each(iter->listClassProperties.begin(), iter->listClassProperties.end(), [&](const am_ClassProperty_s & ref) { - org::genivi::am::am_ClassProperty_s classProp(CAmConvert2CAPIType(ref.classProperty), ref.value); + org::genivi::am::am_ClassProperty_s classProp(ref.classProperty, ref.value); item.listClassProperties.push_back(classProp); }); listSinkClasses.push_back (item); @@ -221,7 +221,7 @@ void CAmCommandSenderService::getListSystemProperties(org::genivi::am::am_System org::genivi::am::am_SystemProperty_s item; for(std::vector::const_iterator iter = list.begin(); iter!=list.end(); iter++) { - item.type = CAmConvert2CAPIType(iter->type); + item.type = iter->type; item.value = iter->value; listSystemProperties.push_back (item); } -- cgit v1.2.1