From 3a1086516a5edf30b3bad6a2e138b03bc0479005 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 17 Jan 2013 12:47:00 +0100 Subject: * changes that follow the review comments from Thomas G. Signed-off-by: Christian Linke --- include/audiomanagertypes.h | 128 ++++++++++++++++++------------------ include/command/IAmCommandReceive.h | 22 ++++--- include/command/IAmCommandSend.h | 18 ++--- include/control/IAmControlReceive.h | 52 +++++++-------- include/control/IAmControlSend.h | 32 ++++----- include/routing/IAmRoutingReceive.h | 22 +++---- include/routing/IAmRoutingSend.h | 10 +-- 7 files changed, 144 insertions(+), 140 deletions(-) mode change 100644 => 100755 include/audiomanagertypes.h (limited to 'include') diff --git a/include/audiomanagertypes.h b/include/audiomanagertypes.h old mode 100644 new mode 100755 index 8e4bf41..cf57933 --- a/include/audiomanagertypes.h +++ b/include/audiomanagertypes.h @@ -19,11 +19,10 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_4739DD27_2A1B_4548_8F5F_7D50DB15209C__INCLUDED_) -#define EA_4739DD27_2A1B_4548_8F5F_7D50DB15209C__INCLUDED_ +#if !defined(EA_E6597B7D_75F2_4586_A193_B3C4EA5C6548__INCLUDED_) +#define EA_E6597B7D_75F2_4586_A193_B3C4EA5C6548__INCLUDED_ #include -#include "projecttypes.h" #include #include @@ -35,63 +34,63 @@ namespace am { /** * a domain ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_domainID_t; /** * a source ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sourceID_t; /** * a sink ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sinkID_t; /** * a gateway ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_gatewayID_t; /** * a crossfader ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_crossfaderID_t; /** * a connection ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_connectionID_t; /** * a mainConnection ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_mainConnectionID_t; /** * speed * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_speed_t; /** * The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef int16_t am_volume_t; @@ -100,40 +99,40 @@ namespace am { * here into meaningful values on the routing interface. * The range of this type is customer specific. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef int16_t am_mainVolume_t; /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sourceClass_t; /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sinkClass_t; /** * time in ms! * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_time_t; /** * offset time that is introduced in milli seconds. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef int16_t am_timeSync_t; /** * describes the active sink of a crossfader. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_HotSink_e { @@ -159,9 +158,9 @@ namespace am { /** * with the help of this enum, sinks and sources can report their availability state * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ - enum am_Availablility_e + enum am_Availability_e { /** * default @@ -181,7 +180,7 @@ namespace am { /** * represents the connection state * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_ConnectionState_e { @@ -211,7 +210,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_DomainState_e { @@ -237,7 +236,7 @@ namespace am { /** * This enum characterizes the data of the EarlyData_t * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_EarlyDataType_e { @@ -267,7 +266,7 @@ namespace am { /** * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_Error_e { @@ -321,7 +320,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_MuteState_e { @@ -343,7 +342,7 @@ namespace am { /** * The source state reflects the state of the source * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_SourceState_e { @@ -366,7 +365,7 @@ namespace am { /** * This enumeration is used to define the type of the action that is correlated to a handle. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_Handle_e { @@ -389,7 +388,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_InterruptState_e { @@ -412,7 +411,7 @@ namespace am { * This datatype determines if a sourceID or a sinkID is used in the union following * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_VolumeType_e { @@ -431,7 +430,7 @@ namespace am { /** * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_NotificationStatus_e { @@ -453,7 +452,8 @@ namespace am { */ NS_MAXIMUM = 4, /** - * The notification is sent out whena change happend. The Resolution of the change is defined by am_NotificationParameter. + * The notification is sent out when a change happened. The Resolution of the change is defined by + * am_NotificationParameter. */ NS_CHANGE = 5, NS_MAX @@ -462,7 +462,7 @@ namespace am { /** * this describes the availability of a sink or a source together with the latest change * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_Availability_s { @@ -471,7 +471,7 @@ namespace am { /** * the current availability state */ - am_Availablility_e availability; + am_Availability_e availability; /** * the reason for the last change. This can be used to trigger events that deal with state changes. */ @@ -482,7 +482,7 @@ namespace am { /** * describes class properties * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_ClassProperty_s { @@ -502,7 +502,7 @@ namespace am { /** * This struct describes the attribiutes of a crossfader. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_Crossfader_s { @@ -545,7 +545,7 @@ namespace am { /** * This struct describes the attributes of a gateway. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_Gateway_s { @@ -630,7 +630,7 @@ namespace am { /** * This represents one "hopp" in a route * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_RoutingElement_s { @@ -658,7 +658,7 @@ namespace am { /** * a list of routing elements that lead from source to sink * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_Route_s { @@ -682,7 +682,7 @@ namespace am { /** * struct describing the sound property * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SoundProperty_s { @@ -702,7 +702,7 @@ namespace am { /** * struct describing system properties * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SystemProperty_s { @@ -722,7 +722,7 @@ namespace am { /** * struct describing sinkclasses * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SinkClass_s { @@ -747,7 +747,7 @@ namespace am { /** * struct describing source classes * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SourceClass_s { @@ -772,7 +772,7 @@ namespace am { /** * this type holds all information of sources relevant to the HMI * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_SourceType_s { @@ -803,7 +803,7 @@ namespace am { /** * this type holds all information of sinks relevant to the HMI * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_SinkType_s { @@ -846,7 +846,7 @@ namespace am { /** * a handle is used for asynchronous operations and is uniquely assigned for each of this operations * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_Handle_s { @@ -866,7 +866,7 @@ namespace am { /** * struct describung mainsound property * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_MainSoundProperty_s { @@ -886,7 +886,7 @@ namespace am { /** * this type holds all information of connections relevant to the HMI * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_MainConnectionType_s { @@ -918,7 +918,7 @@ namespace am { /** * struct that holds attribiutes of a mainconnection * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_MainConnection_s { @@ -955,7 +955,7 @@ namespace am { * This struct holds the payload of a notification. * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_NotificationPayload_s { @@ -964,11 +964,11 @@ namespace am { /** * This defines the notification type */ - am_NotificationType_e notificationType; + am_NotificationType_e type; /** * This is finally the value of the notification. It's meaning depends on the notificationType */ - int16_t notificationValue; + int16_t value; }; @@ -976,7 +976,7 @@ namespace am { * This struct holds information about the configuration for notifications * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_NotificationConfiguration_s { @@ -985,11 +985,11 @@ namespace am { /** * The notification type of the notification */ - am_NotificationType_e notificationType; + am_NotificationType_e type; /** * The Notification status. This can be periodic, min/max value based or even off for example */ - am_NotificationStatus_e notificationStatus; + am_NotificationStatus_e status; /** * This gives additional information to the notification status. * Relation between notification status and the value: @@ -998,14 +998,14 @@ namespace am { * NS_MAXIMUM - the maximum value that triggers the notifcation * NS_CHANGE - the resolution of the change value */ - int16_t notificationParameter; + int16_t parameter; }; /** * This struct describes the attribiutes of a sink * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_Sink_s { @@ -1089,7 +1089,7 @@ namespace am { /** * This struct describes the attribiutes of a source * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_Source_s { @@ -1185,7 +1185,7 @@ namespace am { /** * This struct describes the attribiutes of a domain * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_Domain_s { @@ -1225,7 +1225,7 @@ namespace am { /** * a connection * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_Connection_s { @@ -1259,7 +1259,7 @@ namespace am { * volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ union am_EarlyData_u { @@ -1275,7 +1275,7 @@ namespace am { * sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ union am_DataType_u { @@ -1288,7 +1288,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_EarlyData_s { @@ -1304,7 +1304,7 @@ namespace am { * This types describe a mixed description for source and sinks volumes. * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:24 */ struct am_Volumes_s { @@ -1333,4 +1333,4 @@ namespace am { }; } -#endif // !defined(EA_4739DD27_2A1B_4548_8F5F_7D50DB15209C__INCLUDED_) +#endif // !defined(EA_E6597B7D_75F2_4586_A193_B3C4EA5C6548__INCLUDED_) diff --git a/include/command/IAmCommandReceive.h b/include/command/IAmCommandReceive.h index 5a1a06c..c99fde6 100644 --- a/include/command/IAmCommandReceive.h +++ b/include/command/IAmCommandReceive.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_3888D932_2C16_4c2a_BD7C_E1F819C9A7F0__INCLUDED_) -#define EA_3888D932_2C16_4c2a_BD7C_E1F819C9A7F0__INCLUDED_ +#if !defined(EA_52591199_D6BE_451e_92F8_032DA5493EF4__INCLUDED_) +#define EA_52591199_D6BE_451e_92F8_032DA5493EF4__INCLUDED_ #include #include @@ -47,7 +47,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:24 */ class IAmCommandReceive { @@ -232,36 +232,38 @@ namespace am { */ virtual void confirmCommandRundown(const uint16_t handle, const am_Error_e error) =0; /** - * Rtrieves the list of MainNotifications for a sink. + * Retrieves the list of MainNotifications for a sink. Does not return the possible ones. * * @param sinkID The sinkID * @param listMainNotificationConfigurations */ - virtual am_Error_e getListSinkMainNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const =0; + virtual am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const =0; /** - * Rtrieves the list of MainNotifications for a source. + * Retrieves the list of MainNotifications for a source. Does not return the possible ones. * * @param sourceID The sourceID * @param listMainNotificationConfigurations */ - virtual am_Error_e getListSourceMainNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const =0; + virtual am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const =0; /** * sets a MainNotificationConfiuration. This can be used to turn on an off notifications an to change the mode of the * configuration. + * @return E_OK on success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error * * @param sinkID The sinkID of the MainNotification to be changed * @param mainNotificationConfiguration The MainNotifiication that needs to be set */ - virtual am_Error_e setSinkMainNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e setMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * sets a MainNotificationConfiuration. This can be used to turn on an off notifications an to change the mode of the * configuration. + * @return E_OK on success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error * * @param sourceID The sourceID of the MainNotification to be changed * @param mainNotificationConfiguration The MainNotifiication that needs to be set */ - virtual am_Error_e setSourceMainNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e setMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; }; } -#endif // !defined(EA_3888D932_2C16_4c2a_BD7C_E1F819C9A7F0__INCLUDED_) +#endif // !defined(EA_52591199_D6BE_451e_92F8_032DA5493EF4__INCLUDED_) diff --git a/include/command/IAmCommandSend.h b/include/command/IAmCommandSend.h index ce32131..15577ed 100644 --- a/include/command/IAmCommandSend.h +++ b/include/command/IAmCommandSend.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_B053C89D_3921_4e1a_836D_C3B98FAD2E36__INCLUDED_) -#define EA_B053C89D_3921_4e1a_836D_C3B98FAD2E36__INCLUDED_ +#if !defined(EA_37AC20B5_5E6D_4a3f_BA5F_B3F3CBB21C36__INCLUDED_) +#define EA_37AC20B5_5E6D_4a3f_BA5F_B3F3CBB21C36__INCLUDED_ #include #include @@ -49,7 +49,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:24 */ class IAmCommandSend { @@ -222,34 +222,34 @@ namespace am { */ virtual void cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties) =0; /** - * This callback is called when a notifcated value of a sink changes. + * This callback is called when a notificated value of a sink changes. * * @param sinkID The sinkID * @param notification The payload of the notification */ - virtual void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification) =0; + virtual void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) =0; /** * This callback is called when a notifcated value of a source changes. * * @param sourceID The sourceID * @param notification The payload of the notification */ - virtual void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification) =0; + virtual void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) =0; /** * This callback is triggered when a mainNotificationConfiguration is changed. * * @param sinkID * @param mainNotificationConfiguration The MainNotificationConfiguration that changed */ - virtual void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual void cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * This callback is triggered when a mainNotificationConfiguration is changed. * * @param sourceID * @param mainNotificationConfiguration The MainNotificationConfiguration that changed */ - virtual void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual void cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; }; } -#endif // !defined(EA_B053C89D_3921_4e1a_836D_C3B98FAD2E36__INCLUDED_) +#endif // !defined(EA_37AC20B5_5E6D_4a3f_BA5F_B3F3CBB21C36__INCLUDED_) diff --git a/include/control/IAmControlReceive.h b/include/control/IAmControlReceive.h index ccba927..b5ed674 100644 --- a/include/control/IAmControlReceive.h +++ b/include/control/IAmControlReceive.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_AC2A0532_F989_4f95_A467_1055C94D9C1E__INCLUDED_) -#define EA_AC2A0532_F989_4f95_A467_1055C94D9C1E__INCLUDED_ +#if !defined(EA_D485A61C_B7C5_4803_B4BD_2AD92893E9CA__INCLUDED_) +#define EA_D485A61C_B7C5_4803_B4BD_2AD92893E9CA__INCLUDED_ #include #include @@ -48,7 +48,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:15 + * @created 17-Jan-2013 10:00:24 */ class IAmControlReceive { @@ -677,7 +677,7 @@ namespace am { * @param listConnectionFormats If the size of the list !=0, the list replaces the current one. * @param listMainSoundProperties If the size of the list !=0, the list replaces the current one. */ - virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) =0; + virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * Change the data of the sink. * @@ -690,7 +690,7 @@ namespace am { * @param listMainSoundProperties The list of the mainsoundproperties that need to be changed. Will be changed. if the * length of the list !=0 */ - virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) =0; + virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * changes Gateway Data * @@ -701,7 +701,7 @@ namespace am { * !=0. * @param convertionMatrix the convertionmatrix */ - virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) =0; + virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) =0; /** * with this function, setting of multiple volumes at a time is done. The behavior of the volume set is depended on the * given ramp and time information. @@ -713,7 +713,7 @@ namespace am { * @param handle * @param listVolumes */ - virtual am_Error_e setVolumes(am_Handle_s& handle, const std::vector listVolumes) =0; + virtual am_Error_e setVolumes(am_Handle_s& handle, const std::vector& listVolumes) =0; /** * set a sink notification configuration * @@ -721,15 +721,15 @@ namespace am { * @param sinkID the sinkID * @param notificationConfiguration */ - virtual am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) =0; + virtual am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * set a source notification configuration * * @param handle the handle that will be assigned for this operation * @param sourceID the sinkID - * @param norificationConfiguration + * @param notificationConfiguration */ - virtual am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s norificationConfiguration) =0; + virtual am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * Sends out the main notificiation of a sink * @return E_OK on success, E_UNKNOWN on error @@ -737,7 +737,7 @@ namespace am { * @param sinkID * @param notificationPayload the payload */ - virtual void sendSinkMainNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s notificationPayload) =0; + virtual void sendMainSinkNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s& notificationPayload) =0; /** * Sends out the main notificiation of a source * @return E_OK on success, E_UNKNOWN on error @@ -745,7 +745,7 @@ namespace am { * @param sourceID * @param notificationPayload the payload */ - virtual void sendSourceMainNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s notificationPayload) =0; + virtual void sendMainSourceNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s& notificationPayload) =0; /** * change the mainNotificationConfiguration of a sink * @return E_OK when successful, E_DATABASE on error @@ -753,7 +753,7 @@ namespace am { * @param sinkID the sinkID * @param mainNotificationConfiguration the mainNotificationConfiguration */ - virtual am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * change the mainNotificationConfiguration of a source * @return E_OK when successful, E_DATABASE on error @@ -761,34 +761,34 @@ namespace am { * @param sourceID the sourceID * @param mainNotificationConfiguration the mainNotificationConfiguration */ - virtual am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * Retrieves the Restart Reason Property * @return E_OK on success E_UNKNOWN if property could not be retrieved. * * @param restartReason the restart reason */ - virtual am_Error_e nsmGetRestartReasonProperty(NsmRestartReason_e& restartReason) =0; + virtual am_Error_e getRestartReasonPropertyNSM(NsmRestartReason_e& restartReason) =0; /** * Retrieves the shutdown reason property * @return E_OK on success E_UNKNOWN if property could not be retrieved. * * @param ShutdownReason The shutdown reason */ - virtual am_Error_e nsmGetShutdownReasonProperty(NsmShutdownReason_e& ShutdownReason) =0; + virtual am_Error_e getShutdownReasonPropertyNSM(NsmShutdownReason_e& ShutdownReason) =0; /** * Retrieves the running reason * @return E_OK on success E_UNKNOWN if property could not be retrieved. * * @param nsmRunningReason the running reson */ - virtual am_Error_e nsmGetRunningReasonProperty(NsmRunningReason_e& nsmRunningReason) =0; + virtual am_Error_e getRunningReasonPropertyNSM(NsmRunningReason_e& nsmRunningReason) =0; /** * @return NsmErrorStatus_Ok in case of success * * @param nsmNodeState The current node state */ - virtual NsmErrorStatus_e nsmGetNodeState(NsmNodeState_e& nsmNodeState) =0; + virtual NsmErrorStatus_e getNodeStateNSM(NsmNodeState_e& nsmNodeState) =0; /** * Retrieves the current session state * @return NsmErrorStatus_Ok on success E_UNKNOWN if property could not be retrieved. @@ -797,23 +797,23 @@ namespace am { * @param seatID * @param sessionState The sessionState */ - virtual NsmErrorStatus_e nsmGetSessionState(const std::string& sessionName, const NsmSeat_e& seatID, NsmSessionState_e& sessionState) =0; + virtual NsmErrorStatus_e getSessionStateNSM(const std::string& sessionName, const NsmSeat_e seatID, NsmSessionState_e& sessionState) =0; /** * Retrieves the current applicationmode * @return NsmErrorStatus_Ok on success E_UNKNOWN if property could not be retrieved. * * @param applicationMode The current application Mode */ - virtual NsmErrorStatus_e nsmGetApplicationMode(NsmApplicationMode_e& applicationMode) =0; + virtual NsmErrorStatus_e getApplicationModeNSM(NsmApplicationMode_e& applicationMode) =0; /** * Registers the AudioManager as shutdown client * @return NsmErrorStatus_Ok on success * The interface for the client will be provided by the AudioManagerDeamon, therefore is no need to mention it here. * - * @param shutdownMode The shutdown mode that the controller wants to register for. Can be + * @param shutdownMode The shutdown mode that the controller wants to register for. * @param timeoutMs Max. Timeout to wait for response from shutdown client in ms */ - virtual NsmErrorStatus_e nsmRegisterShutdownClient(const uint32_t shutdownMode, const uint32_t timeoutMs) =0; + virtual NsmErrorStatus_e registerShutdownClientNSM(const uint32_t shutdownMode, const uint32_t timeoutMs) =0; /** * unregisters the AudioManager as shutdown client * @return NsmErrorStatus_Ok on success @@ -821,13 +821,13 @@ namespace am { * @param shutdownMode Shutdown mode for which client wants to unregister (NSM_SHUTDOWNTYPE_NORMAL, * NSM_SHUTDOWNTYPE_FAST) */ - virtual NsmErrorStatus_e nsmUnRegisterShutdownClient(const uint32_t shutdownMode) =0; + virtual NsmErrorStatus_e unRegisterShutdownClientNSM(const uint32_t shutdownMode) =0; /** * @return E_OK on success, E_UNKOWN if interface could not be reached * * @param version */ - virtual am_Error_e nsmGetInterfaceVersion(uint32_t& version) =0; + virtual am_Error_e getInterfaceVersionNSM(uint32_t& version) =0; /** * Sends out the lifecyclerequest complete to the NSM * @return NsmErrorStatus_Ok in case of success @@ -836,8 +836,8 @@ namespace am { * @param status The result of the call to "LifecycleRequest". NsmErrorStatus_Ok: Request successfully processed. * NsmErrorStatus_Error: An error occured while processing the "LifecycleRequest". */ - virtual NsmErrorStatus_e nsmSendLifecycleRequestComplete(const uint32_t RequestId, const NsmErrorStatus_e status) =0; + virtual NsmErrorStatus_e sendLifecycleRequestCompleteNSM(const uint32_t RequestId, const NsmErrorStatus_e status) =0; }; } -#endif // !defined(EA_AC2A0532_F989_4f95_A467_1055C94D9C1E__INCLUDED_) +#endif // !defined(EA_D485A61C_B7C5_4803_B4BD_2AD92893E9CA__INCLUDED_) diff --git a/include/control/IAmControlSend.h b/include/control/IAmControlSend.h index 9b2d0b9..6e2fdc4 100644 --- a/include/control/IAmControlSend.h +++ b/include/control/IAmControlSend.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_9CC33091_C4F5_4262_9C42_042DFB7606F2__INCLUDED_) -#define EA_9CC33091_C4F5_4262_9C42_042DFB7606F2__INCLUDED_ +#if !defined(EA_89F9440C_319B_486f_BAB5_91FED9A658C2__INCLUDED_) +#define EA_89F9440C_319B_486f_BAB5_91FED9A658C2__INCLUDED_ #include #include @@ -49,7 +49,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:15 + * @created 17-Jan-2013 10:00:25 */ class IAmControlSend { @@ -422,7 +422,7 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) =0; + virtual am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * update from the source Data * @@ -432,7 +432,7 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) =0; + virtual am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * updates the Gateway Data * @@ -441,7 +441,7 @@ namespace am { * @param listSinkConnectionFormats * @param convertionMatrix */ - virtual am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) =0; + virtual am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) =0; /** * ack for mulitple volume changes * @@ -449,7 +449,7 @@ namespace am { * @param listVolumes the list of volumes with the current status * @param error */ - virtual void cbAckSetVolume(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error) =0; + virtual void cbAckSetVolumes(const am_Handle_s handle, const std::vector& listVolumes, const am_Error_e error) =0; /** * The acknowledge of the sink notification configuration * @@ -458,24 +458,26 @@ namespace am { */ virtual void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) =0; /** - * The acknowledge of the sink notification configuration + * The acknowledge of the source notification configuration * * @param handle the handle * @param error the error */ virtual void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) =0; /** + * new sinkNotification data is there! * * @param sinkID the sinkID of the changed notification * @param payload the payload */ - virtual void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) =0; + virtual void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) =0; /** + * new sourceNotification data is there! * - * @param sourceID the sinkID of the changed notification + * @param sourceID the sourceID of the changed notification * @param payload the payload */ - virtual void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) =0; + virtual void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) =0; /** * sets a user MainSinkNotificationConfiguration * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error @@ -483,7 +485,7 @@ namespace am { * @param sinkID * @param notificationConfiguration */ - virtual am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) =0; + virtual am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * sets a user MainSourceNotificationConfiguration * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error @@ -491,7 +493,7 @@ namespace am { * @param sourceID * @param notificationConfiguration */ - virtual am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration) =0; + virtual am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * This hook is connected to the NodeState signal of the NodeStateManager * @@ -511,7 +513,7 @@ namespace am { * @param seatID * @param sessionStateID */ - virtual void hookSystemSessionStateChanged(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID) =0; + virtual void hookSystemSessionStateChanged(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID) =0; /** * A lifecycle request comes in from the NSM and must be processed. * @return NsmErrorStatus_Ok if successful @@ -529,4 +531,4 @@ namespace am { }; } -#endif // !defined(EA_9CC33091_C4F5_4262_9C42_042DFB7606F2__INCLUDED_) +#endif // !defined(EA_89F9440C_319B_486f_BAB5_91FED9A658C2__INCLUDED_) diff --git a/include/routing/IAmRoutingReceive.h b/include/routing/IAmRoutingReceive.h index fd88178..2d61f9e 100644 --- a/include/routing/IAmRoutingReceive.h +++ b/include/routing/IAmRoutingReceive.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_36ADD7D1_5B51_4364_9C3B_4839230FAAC2__INCLUDED_) -#define EA_36ADD7D1_5B51_4364_9C3B_4839230FAAC2__INCLUDED_ +#if !defined(EA_B7A11CC8_9777_4421_8677_D9CE084D5E2B__INCLUDED_) +#define EA_B7A11CC8_9777_4421_8677_D9CE084D5E2B__INCLUDED_ #include #include @@ -47,7 +47,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:16 + * @created 17-Jan-2013 10:00:25 */ class IAmRoutingReceive { @@ -373,7 +373,7 @@ namespace am { * @param listSinkFormats * @param convertionMatrix */ - virtual am_Error_e updateGateway(const am_gatewayID_t gatewayID, std::vector listSourceFormats, const std::vector listSinkFormats, std::vector convertionMatrix) =0; + virtual am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceFormats, const std::vector& listSinkFormats, const std::vector& convertionMatrix) =0; /** * updates data of an gateway. @return E_OK on success, E_NON_EXISTENT if the sinkID is not valid. * @@ -383,7 +383,7 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) =0; + virtual am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * updates data of an source. @return E_OK on success, E_NON_EXISTENT if the sourceID in the struct is not valid. * Please note that only the following data out of am_Source_s have effect when they are changed: @@ -398,16 +398,16 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, std::vector listSoundProperties, std::vector listConnectionFormats, const std::vector listMainSoundProperties) =0; + virtual am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** - * acknowledges a asyncsetSinkVolume + * acknowledges a asyncSetSinkVolumes * * @param handle * @param listvolumes The list of volumes that have been set. ramp and time values have no meaning when the struct is * used here. * @param error E_OK on success, E_ABORTED if action was aborted, E_UNKNOWN on error */ - virtual void ackSetVolumes(const am_Handle_s handle, const std::vector listvolumes, const am_Error_e error) =0; + virtual void ackSetVolumes(const am_Handle_s handle, const std::vector& listvolumes, const am_Error_e error) =0; /** * The acknowledge of the SinkNotificationConfiguration * @@ -428,15 +428,15 @@ namespace am { * @param sinkID The sinkID of the sink where the data changed * @param payload The payload */ - virtual void hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) =0; + virtual void hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) =0; /** * is called whenever a notified value needs to be send * * @param sourceID The sinkID of the sink where the data changed * @param payload The payload */ - virtual void hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) =0; + virtual void hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) =0; }; } -#endif // !defined(EA_36ADD7D1_5B51_4364_9C3B_4839230FAAC2__INCLUDED_) +#endif // !defined(EA_B7A11CC8_9777_4421_8677_D9CE084D5E2B__INCLUDED_) diff --git a/include/routing/IAmRoutingSend.h b/include/routing/IAmRoutingSend.h index d077c73..35024e5 100644 --- a/include/routing/IAmRoutingSend.h +++ b/include/routing/IAmRoutingSend.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_3921A27D_CF17_4db4_BE29_6A5BD7C5FE53__INCLUDED_) -#define EA_3921A27D_CF17_4db4_BE29_6A5BD7C5FE53__INCLUDED_ +#if !defined(EA_19B3916A_5323_4939_B585_FE9193DA3FAD__INCLUDED_) +#define EA_19B3916A_5323_4939_B585_FE9193DA3FAD__INCLUDED_ #include #include @@ -47,7 +47,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:16 + * @created 17-Jan-2013 10:00:26 */ class IAmRoutingSend { @@ -217,7 +217,7 @@ namespace am { */ virtual am_Error_e asyncSetVolumes(const am_Handle_s handle, const std::vector& listVolumes) =0; /** - * sets the notification configuration of a source. + * sets the notification configuration of a sink. * @return E_OK on success, E_UNKNOWN on error. * * @param handle The handle for this operation. @@ -237,4 +237,4 @@ namespace am { }; } -#endif // !defined(EA_3921A27D_CF17_4db4_BE29_6A5BD7C5FE53__INCLUDED_) +#endif // !defined(EA_19B3916A_5323_4939_B585_FE9193DA3FAD__INCLUDED_) -- cgit v1.2.1