summaryrefslogtreecommitdiff
path: root/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2013-09-09 18:40:19 +0200
committerChristian Linke <christian.linke@bmw.de>2013-09-09 18:40:19 +0200
commitdb8583483517265e9d6b0fdb3add2cad2cdbcca9 (patch)
tree5bcc78fc3ab73e04e1a6d7f37914334709ea2c65 /PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
parent67b6d070bdea90463aab419d516186f498ebc6d6 (diff)
downloadaudiomanager-db8583483517265e9d6b0fdb3add2cad2cdbcca9.tar.gz
* some naming adoptions & review for GENIVI
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h')
-rw-r--r--PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h42
1 files changed, 19 insertions, 23 deletions
diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
index 4301dd7..750b2c5 100644
--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
+++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
@@ -20,42 +20,38 @@
#include <memory>
#include "audiomanagertypes.h"
-#include <org/genivi/audiomanager/CommandInterface.h>
+#include <org/genivi/am.h>
using namespace am;
-using namespace org::genivi::audiomanager;
/**
* The following functions convert the basics AudiomManager types from/to CommonAPI types.
*/
-extern void CAmConvertAvailablility(const am_Availability_s & , CommandInterface::am_Availability_s & );
-extern void CAmConvertMainSoundProperty(const am_MainSoundProperty_s & , CommandInterface::am_MainSoundProperty_s & );
-extern void CAmConvertSystemProperty(const am_SystemProperty_s &, CommandInterface::am_SystemProperty_s &);
+extern void CAmConvertAvailablility(const am_Availability_s & , org::genivi::am::am_Availability_s & );
+extern void CAmConvertMainSoundProperty(const am_MainSoundProperty_s & , org::genivi::am::am_MainSoundProperty_s & );
+extern void CAmConvertSystemProperty(const am_SystemProperty_s &, org::genivi::am::am_SystemProperty_s &);
-extern CommandInterface::am_ClassProperty_e CAmConvert2CAPIType(const am_ClassProperty_e & property);
-extern CommandInterface::am_SystemPropertyType_e CAmConvert2CAPIType(const am_SystemPropertyType_e &);
-extern CommandInterface::am_Availablility_e CAmConvert2CAPIType(const am_Availability_e & );
-extern CommandInterface::am_AvailabilityReason_e CAmConvert2CAPIType(const am_AvailabilityReason_e & );
+extern org::genivi::am::am_ClassProperty_pe CAmConvert2CAPIType(const am_ClassProperty_e & property);
+extern org::genivi::am::am_SystemPropertyType_pe CAmConvert2CAPIType(const am_SystemPropertyType_e &);
+extern org::genivi::am::am_Availability_e CAmConvert2CAPIType(const am_Availability_e & );
+extern org::genivi::am::am_AvailabilityReason_pe CAmConvert2CAPIType(const am_AvailabilityReason_e & );
-extern CommandInterface::am_MuteState_e CAmConvert2CAPIType(const am_MuteState_e &);
-extern am_MuteState_e CAmConvertFromCAPIType(const CommandInterface::am_MuteState_e &);
+extern org::genivi::am::am_MuteState_e CAmConvert2CAPIType(const am_MuteState_e &);
+extern am_MuteState_e CAmConvertFromCAPIType(const org::genivi::am::am_MuteState_e &);
-extern CommandInterface::am_MainSoundPropertyType_e CAmConvert2CAPIType(const am_MainSoundPropertyType_e &);
-extern am_MainSoundPropertyType_e CAmConvertFromCAPIType(const CommandInterface::am_MainSoundPropertyType_e &);
+extern org::genivi::am::am_MainSoundPropertyType_pe CAmConvert2CAPIType(const am_MainSoundPropertyType_e &);
-extern CommandInterface::am_ConnectionState_e CAmConvert2CAPIType(const am_ConnectionState_e &);
-extern am_ConnectionState_e CAmConvertFromCAPIType(const CommandInterface::am_ConnectionState_e &);
+extern org::genivi::am::am_ConnectionState_e CAmConvert2CAPIType(const am_ConnectionState_e &);
+extern am_ConnectionState_e CAmConvertFromCAPIType(const org::genivi::am::am_ConnectionState_e &);
-extern org::genivi::audiomanager::am::am_NotificationType_e CAmConvert2CAPIType(const am_NotificationType_e &);
-extern am_NotificationType_e CAmConvertFromCAPIType(const org::genivi::audiomanager::am::am_NotificationType_e &);
+extern am_NotificationType_e CAmConvert2CAPIType(const org::genivi::am::am_NotificationType_pe &);
+extern org::genivi::am::am_NotificationType_pe CAmConvertFromCAPIType(const am_NotificationType_e &);
-extern org::genivi::audiomanager::am::am_NotificationStatus_e CAmConvert2CAPIType(const am_NotificationStatus_e &);
-extern am_NotificationStatus_e CAmConvertFromCAPIType(const org::genivi::audiomanager::am::am_NotificationStatus_e &);
+extern am_NotificationStatus_e CAmConvert2CAPIType(const org::genivi::am::am_NotificationStatus_e &);
+extern org::genivi::am::am_NotificationStatus_e CAmConvertFromCAPIType(const am_NotificationStatus_e &);
-extern CommandInterface::am_Error_e CAmConvert2CAPIType(const am_Error_e &);
-extern am_Error_e CAmConvertFromCAPIType(const CommandInterface::am_Error_e & error);
-
-extern am_SystemPropertyType_e CAmConvertFromCAPIType(const CommandInterface::am_SystemPropertyType_e &);
+extern org::genivi::am::am_Error_e CAmConvert2CAPIType(const am_Error_e &);
+extern am_Error_e CAmConvertFromCAPIType(const org::genivi::am::am_Error_e & error);
#endif /* CAMCOMMANDSENDERCOMMON_H_ */