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/control/IAmControlSend.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'include/control/IAmControlSend.h') 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_) -- cgit v1.2.1