summaryrefslogtreecommitdiff
path: root/include/control
diff options
context:
space:
mode:
Diffstat (limited to 'include/control')
-rw-r--r--include/control/IAmControlReceive.h52
-rw-r--r--include/control/IAmControlSend.h32
2 files changed, 43 insertions, 41 deletions
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 <vector>
#include <string>
@@ -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<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, const std::vector<am_MainSoundProperty_s> listMainSoundProperties) =0;
+ virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& 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<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, const std::vector<am_MainSoundProperty_s> listMainSoundProperties) =0;
+ virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& 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<am_ConnectionFormat_e> listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e> listSinkConnectionFormats, const std::vector<bool> convertionMatrix) =0;
+ virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& 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<am_Volumes_s> listVolumes) =0;
+ virtual am_Error_e setVolumes(am_Handle_s& handle, const std::vector<am_Volumes_s>& 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 <vector>
#include <string>
@@ -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<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties) =0;
+ virtual am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& 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<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties) =0;
+ virtual am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& 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<am_ConnectionFormat_e> listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e> listSinkConnectionFormats, const std::vector<bool> convertionMatrix) =0;
+ virtual am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& 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<am_Volumes_s> listVolumes, const am_Error_e error) =0;
+ virtual void cbAckSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& 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_)
View Lorry Controller Status