diff options
author | Christian Linke <christian.linke@bmw.de> | 2013-09-09 18:40:19 +0200 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2013-09-09 18:40:19 +0200 |
commit | db8583483517265e9d6b0fdb3add2cad2cdbcca9 (patch) | |
tree | 5bcc78fc3ab73e04e1a6d7f37914334709ea2c65 /PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h | |
parent | 67b6d070bdea90463aab419d516186f498ebc6d6 (diff) | |
download | audiomanager-db8583483517265e9d6b0fdb3add2cad2cdbcca9.tar.gz |
* some naming adoptions & review for GENIVI
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h')
-rw-r--r-- | PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h index 63c9ea8..e30f18f 100644 --- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h +++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h @@ -20,40 +20,42 @@ #include <memory> #include "audiomanagertypes.h" -#include <org/genivi/audiomanager/am_gen.h> +#include <org/genivi/am.h> using namespace am; -using namespace org::genivi::audiomanager; using namespace CommonAPI; /** * Utility functions */ -extern void CAmConvertCAPI2AM(const am_gen::am_Domain_s &, am_Domain_s &); -extern void CAmConvertCAPI2AM(const am_gen::sourceData_s & , am::am_Source_s & ); -extern void CAmConvertCAPI2AM(const am_gen::sinkData_s & , am::am_Sink_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_Availability_s & , am_Availability_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_SoundProperty_s &, am::am_SoundProperty_s &); -extern void CAmConvertCAPI2AM(const am_gen::am_MainSoundProperty_s &, am::am_MainSoundProperty_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_NotificationConfiguration_s & , am::am_NotificationConfiguration_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_Gateway_s & , am::am_Gateway_s & ); -extern void CAmConvertCAPI2AM(const am_gen::crossfaderData_s & , am::am_Crossfader_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_EarlyData_s & , am::am_EarlyData_s & ); -extern void CAmConvertCAPI2AM(const am_gen::am_EarlyData_u &, am::am_EarlyData_u & ); -extern void CAmConvertCAPI2AM(const am_gen::am_DataType_u & , am::am_DataType_u & ); -extern void CAmConvertCAPI2AM(const am_gen::am_Volumes_s &, am::am_Volumes_s &); -extern void CAmConvertCAPI2AM(const am_gen::notificationPayload_s & , am::am_NotificationPayload_s & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_NotificationConfiguration_s> & , std::vector<am::am_NotificationConfiguration_s> & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_SoundProperty_s> &, std::vector<am::am_SoundProperty_s> &); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_ConnectionFormat_e> &, std::vector<am::am_ConnectionFormat_e> & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_MainSoundProperty_s> &, std::vector<am::am_MainSoundProperty_s> & ); -extern void CAmConvertCAPIVector2AM(const std::vector<am_gen::am_Volumes_s> &, std::vector<am::am_Volumes_s> & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Domain_s &, am_Domain_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Source_s & , am::am_Source_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Sink_s & , am::am_Sink_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Availability_s & , am_Availability_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_SoundProperty_s &, am::am_SoundProperty_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_MainSoundProperty_s &, am::am_MainSoundProperty_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationConfiguration_s & , am::am_NotificationConfiguration_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Gateway_s & , am::am_Gateway_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Crossfader_s & , am::am_Crossfader_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_EarlyData_s & , am::am_EarlyData_s & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_EarlyData_u &, am::am_EarlyData_u & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_DataType_u & , am::am_DataType_u & ); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Volumes_s &, am::am_Volumes_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_Handle_s &, am::am_Handle_s &); +extern void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationPayload_s & , am::am_NotificationPayload_s & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_NotificationConfiguration_s> & , std::vector<am::am_NotificationConfiguration_s> & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_SoundProperty_s> &, std::vector<am::am_SoundProperty_s> &); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_ConnectionFormat_pe> &, std::vector<am::am_ConnectionFormat_e> & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_MainSoundProperty_s> &, std::vector<am::am_MainSoundProperty_s> & ); +extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_Volumes_s> &, std::vector<am::am_Volumes_s> & ); +extern void CAmConvertCAPIVector2AM(const org::genivi::am::am_EarlyData_L &, std::vector<am::am_EarlyData_s> &); -extern void CAmConvertAM2CAPI(const am_Availability_s & , am_gen::am_Availability_s & ); -extern void CAmConvertAM2CAPI(const am::am_SoundProperty_s &, am_gen::am_SoundProperty_s &); -extern void CAmConvertAM2CAPI(const am::am_NotificationConfiguration_s &, am_gen::am_NotificationConfiguration_s &); -extern void CAmConvertAM2CAPI(const am::am_Volumes_s &, am_gen::am_Volumes_s &); -extern void CAmConvertAMVector2CAPI(const std::vector<am::am_SoundProperty_s> &, std::vector<am_gen::am_SoundProperty_s> &); -extern void CAmConvertAMVector2CAPI(const std::vector<am::am_Volumes_s> & , std::vector<am_gen::am_Volumes_s> & ); +extern void CAmConvertAM2CAPI(const am_Availability_s & , org::genivi::am::am_Availability_s & ); +extern void CAmConvertAM2CAPI(const am::am_SoundProperty_s &, org::genivi::am::am_SoundProperty_s &); +extern void CAmConvertAM2CAPI(const am::am_NotificationConfiguration_s &, org::genivi::am::am_NotificationConfiguration_s &); +extern void CAmConvertAM2CAPI(const am::am_Volumes_s &, org::genivi::am::am_Volumes_s &); +extern void CAmConvertAMVector2CAPI(const std::vector<am::am_SoundProperty_s> &, std::vector<org::genivi::am::am_SoundProperty_s> &); +extern void CAmConvertAMVector2CAPI(const std::vector<am::am_Volumes_s> & , std::vector<org::genivi::am::am_Volumes_s> & ); +extern void CAmConvertAM2CAPI(const am::am_Handle_s &, org::genivi::am::am_Handle_s &); #endif /* CAMROUTINGSENDERCOMMON_H_ */ |