summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon
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 /AudioManagerDaemon
parent67b6d070bdea90463aab419d516186f498ebc6d6 (diff)
downloadaudiomanager-db8583483517265e9d6b0fdb3add2cad2cdbcca9.tar.gz
* some naming adoptions & review for GENIVI
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon')
-rw-r--r--AudioManagerDaemon/fidls/AudioManagerTypes.fidl1234
-rwxr-xr-xAudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fidl127
-rwxr-xr-xAudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.LifecycleConsumer.fidl16
-rw-r--r--AudioManagerDaemon/fidls/NodeStateManager.fdepl (renamed from AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fdepl)4
-rw-r--r--AudioManagerDaemon/fidls/NodeStateManager.fidl152
-rwxr-xr-xAudioManagerDaemon/fidls/amTypes.fidl330
-rw-r--r--AudioManagerDaemon/include/CAmNodeStateCommunicatorCAPI.h7
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h55
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h70
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp374
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h68
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp)245
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h)81
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h)263
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h)97
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h)97
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp)127
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h)71
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h55
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h70
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp)23
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h)27
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp)25
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h)27
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h)25
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h)25
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h)25
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp)21
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h (renamed from AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h)27
-rw-r--r--AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp28
30 files changed, 1999 insertions, 1797 deletions
diff --git a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
new file mode 100644
index 0000000..0850d33
--- /dev/null
+++ b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
@@ -0,0 +1,1234 @@
+package org.genivi
+
+<**
+ @author : Christian Linke
+**>
+typeCollection am {
+ version {
+ major 1
+ minor 0
+ }
+ array am_MainConnection_L of am_MainConnectionType_s
+
+ array am_SinkClass_L of am_SinkClass_s
+
+ array am_SinkType_L of am_SinkType_s
+
+ array am_SourceClass_L of am_SourceClass_s
+
+ array am_SourceType_L of am_SourceType_s
+
+ array am_SystemProperty_L of am_SystemProperty_s
+
+ array am_ClassProperty_L of am_ClassProperty_s
+
+ array am_ConnectionID_L of am_connectionID_t
+
+ array am_EarlyData_L of am_EarlyData_s
+
+ array am_MainSoundProperty_L of am_MainSoundProperty_s
+
+ array am_NotificationConfiguration_L of am_NotificationConfiguration_s
+
+ array am_RoutingElement_L of am_RoutingElement_s
+
+ array am_SoundProperty_L of am_SoundProperty_s
+
+ array am_Volumes_L of am_Volumes_s
+
+ array am_ConnectionFormat_L of am_ConnectionFormat_pe
+
+ array am_Convertion_L of am_bool_t
+
+ <**
+ @description : a source ID
+ **>
+ typedef am_sourceID_t is UInt16
+ typedef am_bool_t is Boolean
+
+ <**
+ @description : a domain ID
+ **>
+ typedef am_domainID_t is UInt16
+
+ <**
+ @description : a gateway ID
+ **>
+ typedef am_gatewayID_t is UInt16
+
+ <**
+ @description : a connection ID
+ **>
+ typedef am_connectionID_t is UInt16
+
+ <**
+ @description : a crossfader ID
+ **>
+ typedef am_crossfaderID_t is UInt16
+
+ <**
+ @description : a mainConnection ID
+ **>
+ typedef am_mainConnectionID_t is UInt16
+
+ <**
+ @description : This is the volume presented on the command interface. It is in the duty of the Controller to change the volumes given here into meaningful values on the routing interface.
+The range of this type is customer specific.
+ **>
+ typedef am_mainVolume_t is Int16
+
+ <**
+ @description : The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project.
+ **>
+ typedef am_volume_t is Int16
+
+ <**
+ @description : time in ms!
+ **>
+ typedef am_time_t is Int16
+
+ <**
+ @description : offset time that is introduced in milli seconds.
+ **>
+ typedef am_timeSync_t is Int16
+ typedef am_sourceClass_t is UInt16
+
+ <**
+ @description : speed
+ **>
+ typedef am_speed_t is UInt16
+ typedef am_sinkClass_t is UInt16
+
+ <**
+ @description : a sink ID
+ **>
+ typedef am_sinkID_t is UInt16
+
+ <**
+ @description : This project specific value classifies the format in which data is exchanged within a connection.
+ **>
+ typedef am_ConnectionFormat_pe is UInt16
+
+ <**
+ @description : This project specific value gives the information about reason for reason for Source/Sink change
+ **>
+ typedef am_AvailabilityReason_pe is UInt16
+
+ <**
+ @description : product specific identifier of property
+ **>
+ typedef am_ClassProperty_pe is UInt16
+
+ <**
+ @description : For products, different ramp types can be defined here.
+It is in the responsibility of the product to make sure that the routing plugins are aware of the ramp types used.
+ **>
+ typedef am_RampType_pe is UInt16
+
+ <**
+ @description : Project specific sound properties.
+ **>
+ typedef am_SoundPropertyType_pe is UInt16
+
+ <**
+ @description : Here are all SoundProperties that can be set via the CommandInterface. Product specific
+ **>
+ typedef am_MainSoundPropertyType_pe is UInt16
+
+ <**
+ @description : describes the different system properties. Project specific
+ **>
+ typedef am_SystemPropertyType_pe is UInt16
+
+ <**
+ @description : gives the type of the Notification.
+ **>
+ typedef am_NotificationType_pe is UInt16
+
+ <**
+ @description : with the help of this enum, sinks and sources can report their availability state
+ **>
+ enumeration am_Availability_e {
+
+ <**
+ @description : default
+ **>
+ A_UNKNOWN = "0"
+
+ <**
+ @description : The source / sink is available
+ **>
+ A_AVAILABLE = "1"
+
+ <**
+ @description : the source / sink is not available
+ **>
+ A_UNAVAILABLE = "2"
+ A_MAX
+ }
+
+ <**
+ @description : describes the active sink of a crossfader.
+ **>
+ enumeration am_HotSink_e {
+
+ <**
+ @description : default
+ **>
+ HS_UNKNOWN = "0"
+
+ <**
+ @description : sinkA is active
+ **>
+ HS_SINKA = "1"
+
+ <**
+ @description : sinkB is active
+ **>
+ HS_SINKB = "2"
+
+ <**
+ @description : the crossfader is in the transition state
+ **>
+ HS_INTERMEDIATE = "3"
+ HS_MAX
+ }
+
+ <**
+ @description : represents the connection state
+ **>
+ enumeration am_ConnectionState_e {
+ CS_UNKNOWN = "0"
+
+ <**
+ @description : This means the connection is just building up
+ **>
+ CS_CONNECTING = "1"
+
+ <**
+ @description : the connection is ready to be used
+ **>
+ CS_CONNECTED = "2"
+
+ <**
+ @description : the connection is in the course to be knocked down
+ **>
+ CS_DISCONNECTING = "3"
+
+ <**
+ @description : only relevant for connectionStatechanged. Is send after the connection was removed
+ **>
+ CS_DISCONNECTED = "4"
+
+ <**
+ @description : this means the connection is still build up but unused at the moment
+ **>
+ CS_SUSPENDED = "5"
+ CS_MAX
+ }
+
+ enumeration am_DomainState_e {
+
+ <**
+ @description : default
+ **>
+ DS_UNKNOWN = "0"
+
+ <**
+ @description : the domain is controlled by the daemon
+ **>
+ DS_CONTROLLED = "1"
+
+ <**
+ @description : the domain is independent starting up
+ **>
+ DS_INDEPENDENT_STARTUP = "1"
+
+ <**
+ @description : the domain is independent running down
+ **>
+ DS_INDEPENDENT_RUNDOWN = "2"
+ DS_MAX
+ }
+
+ <**
+ @description : This enum characterizes the data of the EarlyData_t
+ **>
+ enumeration am_EarlyDataType_e {
+
+ <**
+ @description : default
+ **>
+ ES_UNKNOWN = "0"
+
+ <**
+ @description : the source volume
+ **>
+ ED_SOURCE_VOLUME = "1"
+
+ <**
+ @description : the sink volume
+ **>
+ ED_SINK_VOLUME = "2"
+
+ <**
+ @description : a source property
+ **>
+ ED_SOURCE_PROPERTY = "3"
+
+ <**
+ @description : a sink property
+ **>
+ ED_SINK_PROPERTY = "4"
+ ED_MAX
+ }
+
+ <**
+ @description : the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter.
+ **>
+ enumeration am_Error_e {
+
+ <**
+ @description : no error - positive reply
+ **>
+ E_OK = "0"
+
+ <**
+ @description : default
+ **>
+ E_UNKNOWN = "1"
+
+ <**
+ @description : value out of range
+ **>
+ E_OUT_OF_RANGE = "2"
+
+ <**
+ @description : not used
+ **>
+ E_NOT_USED = "3"
+
+ <**
+ @description : a database error occurred
+ **>
+ E_DATABASE_ERROR = "4"
+
+ <**
+ @description : the desired object already exists
+ **>
+ E_ALREADY_EXISTS = "5"
+
+ <**
+ @description : there is no change
+ **>
+ E_NO_CHANGE = "6"
+
+ <**
+ @description : the desired action is not possible
+ **>
+ E_NOT_POSSIBLE = "7"
+
+ <**
+ @description : the desired object is non existent
+ **>
+ E_NON_EXISTENT = "8"
+
+ <**
+ @description : the asynchronous action was aborted
+ **>
+ E_ABORTED = "9"
+
+ <**
+ @description : This error is returned in case a connect is issued with a connectionFormat that cannot be selected for the connection. This could be either due to the capabilities of a source or a sink or gateway compatibilities for example
+ **>
+ E_WRONG_FORMAT = "10"
+ E_MAX
+ }
+
+ enumeration am_MuteState_e {
+
+ <**
+ @description : default
+ **>
+ MS_UNKNOWN = "0"
+
+ <**
+ @description : the source / sink is muted
+ **>
+ MS_MUTED = "1"
+
+ <**
+ @description : the source / sink is unmuted
+ **>
+ MS_UNMUTED = "2"
+ MS_MAX
+ }
+
+ enumeration am_InterruptState_e {
+
+ <**
+ @description : default
+ **>
+ IS_UNKNOWN = "0"
+
+ <**
+ @description : the interrupt state is off - no interrupt
+ **>
+ IS_OFF = "1"
+
+ <**
+ @description : the interrupt state is interrupted - the interrupt is active
+ **>
+ IS_INTERRUPTED = "2"
+ IS_MAX
+ }
+
+ <**
+ @description : This datatype determines if a sourceID or a sinkID is used in the union following
+ **>
+ enumeration am_VolumeType_e {
+ VT_UNKNOWN = "0"
+
+ <**
+ @description : the following type is a sink
+ **>
+ VT_SINK = "1"
+
+ <**
+ @description : the following type is a source
+ **>
+ VT_SOURCE = "2"
+ VT_MAX
+ }
+
+ enumeration am_NotificationStatus_e {
+ NS_UNKNOWN = "0"
+
+ <**
+ @description : No notification, the function is turned off
+ **>
+ NS_OFF = "1"
+
+ <**
+ @description : Periodic notifications are sent out. The period in ms is given by am_NotificationParameter
+ **>
+ NS_PERIODIC = "2"
+
+ <**
+ @description : The notification is sent out when the minimum given by am_NotificationParameter is reached.
+ **>
+ NS_MINIMUM = "3"
+
+ <**
+ @description : The notification is sent out when the maximum given by am_NotificationParameter is reached.
+ **>
+ NS_MAXIMUM = "4"
+
+ <**
+ @description : The notification is sent out when a change happened. The Resolution of the change is defined by am_NotificationParameter.
+ **>
+ NS_CHANGE_ = "5"
+ NS_MAX
+ }
+
+ <**
+ @description : This enumeration is used to define the type of the action that is correlated to a handle.
+ **>
+ enumeration am_Handle_e {
+ H_UNKNOWN = "0"
+ H_CONNECT = "1"
+ H_DISCONNECT = "2"
+ H_SETSOURCESTATE = "3"
+ H_SETSINKVOLUME = "4"
+ H_SETSOURCEVOLUME = "5"
+ H_SETSINKSOUNDPROPERTY = "6"
+ H_SETSOURCESOUNDPROPERTY = "7"
+ H_SETSINKSOUNDPROPERTIES = "8"
+ H_SETSOURCESOUNDPROPERTIES = "9"
+ H_CROSSFADE = "10"
+ H_SETVOLUMES = "11"
+ H_SETSINKNOTIFICATION = "12"
+ H_SETSOURCENOTIFICATION = "13"
+ H_MAX
+ }
+
+ <**
+ @description : The source state reflects the state of the source
+ **>
+ enumeration am_SourceState_e {
+ SS_UNKNNOWN = "0"
+
+ <**
+ @description : The source can be activly heared
+ **>
+ SS_ON = "1"
+
+ <**
+ @description : The source cannot be heared
+ **>
+ SS_OFF = "2"
+
+ <**
+ @description : The source is paused. Meaning it cannot be heared but should be prepared to play again soon.
+ **>
+ SS_PAUSED = "3"
+ SS_MAX
+ }
+
+ <**
+ @description : This enum describes the ready state of the routing part
+ **>
+ enumeration am_RoutingReady_e {
+ RR_UNKNOWN = "0"
+ RR_READY = "1"
+ RR_RUNDOWN = "2"
+ }
+
+ <**
+ @description : a list of routing elements that lead from source to sink
+ **>
+ struct am_Route_s {
+
+ <**
+ @description : the sourceID where the route starts
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : the sinkID where the route ends
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : the actual route as list of routing elements
+ **>
+ am_RoutingElement_L route
+ }
+
+ <**
+ @description : this describes the availability of a sink or a source together with the latest change
+ **>
+ struct am_Availability_s {
+
+ <**
+ @description : the current availability state
+ **>
+ am_Availability_e availability
+
+ <**
+ @description : the reason for the last change. This can be used to trigger events that deal with state changes.
+ **>
+ am_AvailabilityReason_pe availabilityReason
+ }
+
+ <**
+ @description : describes class properties
+ **>
+ struct am_ClassProperty_s {
+
+ <**
+ @description : the property as enum
+ **>
+ am_ClassProperty_pe classProperty
+
+ <**
+ @description : the value of the property
+ **>
+ Int16 value
+ }
+
+ <**
+ @description : This struct describes the attribiutes of a crossfader.
+ **>
+ struct am_Crossfader_s {
+
+ <**
+ @description : This is the ID of the crossfader, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManager daemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+ **>
+ am_crossfaderID_t crossfaderID
+
+ <**
+ @description : The name of the crossfader. Must be unique in the whole system.
+ **>
+ String name
+
+ <**
+ @description : The sinkID of the SinkA. Sinks shall be registered before registering the crossfader.
+ **>
+ am_sinkID_t sinkID_A
+
+ <**
+ @description : The sinkID of the SinkB. Sinks shall be registered before registering the crossfader.
+ **>
+ am_sinkID_t sinkID_B
+
+ <**
+ @description : The sourceID of the crossfader source. The source shall be registered before the crossfader.
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : This enum can have 3 states:
+
+ HS_SINKA sinkA is the current hot one, sinkB is not audible
+ HS_SINKB sinkB is the current hot one, sinkB is not audible
+ HS_INTERMEDIATE the fader is stuck in between a cross-fading action. This could be due to an abort or an error. Before using the crossfader, it must be set to either HS_SINKA or HS_SINKB.
+ **>
+ am_HotSink_e hotSink
+ }
+
+ <**
+ @description : This struct describes the attributes of a gateway.
+ **>
+ struct am_Gateway_s {
+
+ <**
+ @description : This is the ID of the gateway, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+ **>
+ am_gatewayID_t gatewayID
+
+ <**
+ @description : The name of the gateway. Must be unique in the whole system.
+ **>
+ String name
+
+ <**
+ @description : The sinkID of the gateway sink-end. The sink is a full blown sink with connectionFormats, sinkClassIDs etc... It makes sense to register the sinks of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the sink is located in the controllingDomain, the ID needs to be retrieved by registering the sink before registering the gateway. In case the sink is in a different domain, the ID needs to be retrieved via peeking.
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : The sourceID of the gateway sink-end. The sink is a full blown source with connectionFormats, sinkClassIDs etc... It makes sense to register the sources of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the source is located in the controllingDomain, the ID needs to be retrieved by registering the source before registering the gateway. In case the source is in a different domain, the ID needs to be retrieved via peeking.
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : The ID of the sink. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.
+ **>
+ am_domainID_t domainSinkID
+
+ <**
+ @description : The ID of the source. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.
+ **>
+ am_domainID_t domainSourceID
+
+ <**
+ @description : This is the ID of the domain that registers the gateway.
+ **>
+ am_domainID_t controlDomainID
+
+ <**
+ @description : This is the list of available formats on the source side of the gateway. It is not defined during the gateway registration but copied from the source registration.
+ **>
+ am_ConnectionFormat_L listSourceFormats
+
+ <**
+ @description : This is the list of available formats on the sink side of the gateway. It is not defined during the gateway registration but copied from the sink registration.
+ **>
+ am_ConnectionFormat_L listSinkFormats
+
+ <**
+ @description : This is matrix holding information about the conversion capability of the gateway, it's length is defined by the length(listSinkFormats) x length(listSourceFormats).
+If a SinkFormat can be converted into a SourceFormat, the vector will hold a 1, if no conversion is possible, a 0.
+The data is stored row orientated, where the rows are related to the sinksFormats and the columns to the sourceFormats. The first value will hold the conversion information from the first sourceFormat to the first sinkFormat for example and the seventh value the information about the 3rd sinkFormat to the 1st sourceFormat in case we would have 3 sourceFormats.
+ **>
+ am_Convertion_L convertionMatrix
+ }
+
+ <**
+ @description : This represents one "hopp" in a route
+ **>
+ struct am_RoutingElement_s {
+
+ <**
+ @description : the source ID
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : the sinkID
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : the domainID the routeElement is in
+ **>
+ am_domainID_t domainID
+
+ <**
+ @description : the connectionformat that is used for the route
+ **>
+ am_ConnectionFormat_pe connectionFormat
+ }
+
+ <**
+ @description : struct describing the sound property
+ **>
+ struct am_SoundProperty_s {
+
+ <**
+ @description : the type of the property - a project specific enum
+ **>
+ am_SoundPropertyType_pe type
+
+ <**
+ @description : the actual value of the property
+ **>
+ Int16 value
+ }
+
+ <**
+ @description : struct describing system properties
+ **>
+ struct am_SystemProperty_s {
+
+ <**
+ @description : the type that is set
+ **>
+ am_SystemPropertyType_pe type
+
+ <**
+ @description : the value
+ **>
+ Int16 value
+ }
+
+ <**
+ @description : struct describing sinkclasses
+ **>
+ struct am_SinkClass_s {
+
+ <**
+ @description : the ID of the sinkClass
+ **>
+ am_sinkClass_t sinkClassID
+
+ <**
+ @description : the name of the sinkClass - must be unique in the system
+ **>
+ String name
+
+ <**
+ @description : the list of the class properties. These are pairs of a project specific enum describing the type of the value and an integer holding the real value.
+ **>
+ am_ClassProperty_L listClassProperties
+ }
+
+ <**
+ @description : struct describing source classes
+ **>
+ struct am_SourceClass_s {
+
+ <**
+ @description : the source ID
+ **>
+ am_sourceClass_t sourceClassID
+
+ <**
+ @description : the name of the sourceClass - must be unique in the system
+ **>
+ String name
+
+ <**
+ @description : the list of the class properties. These are pairs of a project specific enum describing the type of the value and an integer holding the real value.
+ **>
+ am_ClassProperty_L listClassProperties
+ }
+
+ <**
+ @description : this type holds all information of sources relevant to the HMI
+ **>
+ struct am_SourceType_s {
+
+ <**
+ @description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : The name of the source. Must be unique in the whole system.
+ **>
+ String name
+
+ <**
+ @description : the availability of the source
+ **>
+ am_Availability_s availability
+
+ <**
+ @description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes.
+ **>
+ am_sourceClass_t sourceClassID
+ }
+
+ <**
+ @description : this type holds all information of sinks relevant to the HMI
+ **>
+ struct am_SinkType_s {
+
+ <**
+ @description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : The name of the sink. Must be unique in the whole system.
+ **>
+ String name
+
+ <**
+ @description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- &amp; undervoltage. The availability consists of two pieces of information:
+
+ Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN
+ AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.
+ **>
+ am_Availability_s availability
+
+ <**
+ @description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes.
+ **>
+ am_mainVolume_t volume
+ am_MuteState_e muteState
+
+ <**
+ @description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour.
+ **>
+ am_sinkClass_t sinkClassID
+ }
+
+ <**
+ @description : a handle is used for asynchronous operations and is uniquely assigned for each of this operations
+ **>
+ struct am_Handle_s {
+
+ <**
+ @description : the handletype
+ **>
+ am_Handle_e handleType
+
+ <**
+ @description : the handle as value
+ **>
+ UInt16 handle
+ }
+
+ <**
+ @description : struct describung mainsound property
+ **>
+ struct am_MainSoundProperty_s {
+
+ <**
+ @description : the type of the property
+ **>
+ am_MainSoundPropertyType_pe type
+
+ <**
+ @description : the actual value
+ **>
+ Int16 value
+ }
+
+ <**
+ @description : this type holds all information of connections relevant to the HMI
+ **>
+ struct am_MainConnectionType_s {
+
+ <**
+ @description : the ID of the mainconnection
+ **>
+ am_mainConnectionID_t mainConnectionID
+
+ <**
+ @description : the sourceID where the connection starts
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : the sinkID where the connection ends
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : the delay of the mainconnection
+ **>
+ am_timeSync_t delay
+
+ <**
+ @description : the current connection state
+ **>
+ am_ConnectionState_e connectionState
+ }
+
+ <**
+ @description : struct that holds attribiutes of a mainconnection
+ **>
+ struct am_MainConnection_s {
+
+ <**
+ @description : the assigned ID
+ **>
+ am_mainConnectionID_t mainConnectionID
+
+ <**
+ @description : the current connection state
+ **>
+ am_ConnectionState_e connectionState
+
+ <**
+ @description : the sinkID
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : the sourceID
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : the delay of the connection
+ **>
+ am_timeSync_t delay
+
+ <**
+ @description : the list of sub connection IDs the mainconnection consists of
+ **>
+ am_ConnectionID_L listConnectionID
+ }
+
+ <**
+ @description : This struct holds the payload of a notification.
+ **>
+ struct am_NotificationPayload_s {
+
+ <**
+ @description : This defines the notification type
+ **>
+ am_NotificationType_pe type
+
+ <**
+ @description : This is finally the value of the notification. It's meaning depends on the notificationType
+ **>
+ Int16 value
+ }
+
+ <**
+ @description : This struct holds information about the configuration for notifications
+ **>
+ struct am_NotificationConfiguration_s {
+
+ <**
+ @description : The notification type of the notification
+ **>
+ am_NotificationType_pe type
+
+ <**
+ @description : The Notification status. This can be periodic, min/max value based or even off for example
+ **>
+ am_NotificationStatus_e status
+
+ <**
+ @description : This gives additional information to the notification status.
+Relation between notification status and the value:
+NS_PERIODIC - the period in ms
+NS_MINIMUM - the minimum value that triggers the notification
+NS_MAXIMUM - the maximum value that triggers the notifcation
+NS_CHANGE - the resolution of the change value
+ **>
+ Int16 parameter
+ }
+
+ <**
+ @description : This struct describes the attribiutes of a sink
+ **>
+ struct am_Sink_s {
+
+ <**
+ @description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : The name of the sink. Must be unique in the whole system.
+ **>
+ String name
+
+ <**
+ @description : The domainID is the domain the sink belongs to. A sink can only be in one domain.
+ **>
+ am_domainID_t domainID
+
+ <**
+ @description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour.
+ **>
+ am_sinkClass_t sinkClassID
+
+ <**
+ @description : This is the volume of the sink. It is set by the AudioManagerController.
+ **>
+ am_volume_t volume
+
+ <**
+ @description : This Boolean flag indicates whether a sink is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sinks, for example if the sink is part of a crossfader or gateway. HMI relevant changes in visible sinks will be automatically reported by the daemon to the commandInterface.
+ **>
+ Boolean visible
+
+ <**
+ @description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- &amp; undervoltage. The availability consists of two pieces of information:
+
+ Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN
+ AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.
+ **>
+ am_Availability_s available
+
+ <**
+ @description : This attribute reflects the muteState of the sink. The information is not the "real" state of the sink, but the HMI representation for he commandInterface controlled by the AudioManagerController.
+ **>
+ am_MuteState_e muteState
+
+ <**
+ @description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes.
+ **>
+ am_mainVolume_t mainVolume
+
+ <**
+ @description : This is the list of soundProperties, that the sink is capable of. The soundProperties itself are project specific. For sinks, a possible soundProperty could be for example settings.
+ **>
+ am_SoundProperty_L listSoundProperties
+
+ <**
+ @description : This list holds information about the formats that the Source is capable of supporting when delivering audio.
+ **>
+ am_ConnectionFormat_L listConnectionFormats
+
+ <**
+ @description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface.
+ **>
+ am_MainSoundProperty_L listMainSoundProperties
+
+ <**
+ @description : This is the list of the MainNotificationConfigurations. These notifications work on the level of command interface.
+ **>
+ am_NotificationConfiguration_L listMainNotificationConfigurations
+
+ <**
+ @description : This is the list of the NotificationConfigurations. These notifications work on the level of RoutingPlugins.
+ **>
+ am_NotificationConfiguration_L listNotificationConfigurations
+ }
+
+ <**
+ @description : This struct describes the attribiutes of a source
+ **>
+ struct am_Source_s {
+
+ <**
+ @description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : The domainID is the domain the source belongs to. A source can only be in one domain.
+ **>
+ am_domainID_t domainID
+
+ <**
+ @description : The name of the source. Must be unique in the whole system.
+ **>
+ String name
+
+ <**
+ @description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes.
+ **>
+ am_sourceClass_t sourceClassID
+
+ <**
+ @description : The source state is an indication towards the source if it is actively heard or not. The source can use this information to implement features like automatic spin down of CD's in case the CD is not the active source or AF following of a tuner that is not actively heard. The source state is set by the AudioManagerController.There are 3 possible states:
+
+ SS_ON: the source is active
+ SS_OFF: the source is off
+ SS_PAUSED: the source is paused and not active.
+ **>
+ am_SourceState_e sourceState
+
+ <**
+ @description : This is the volume of the source. It is set by the AudioManagerController. It is used to adopt different audiolevels in a system and mixing of sources (e.g. navigation hints &amp; music).
+ **>
+ am_volume_t volume
+
+ <**
+ @description : This Boolean flag indicates whether a source is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sources, for example if the source is part of a crossfader or gateway. HMI relevant changes in visible sources will be automatically reported by the daemon to the commandInterface.
+ **>
+ Boolean visible
+
+ <**
+ @description : This attribute reflects the availability of the source. There are several reasons why a source could be not available for the moment. For example a CD player which has no CD entered in the slot can be unavailable, or a USB player with no or unreadable stick attached. Other scenarios involve the shutdown of a source because of overtemperature or over- &amp; undervoltage. The availability consists of two informations:
+
+ Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN
+ AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.
+ **>
+ am_Availability_s available
+
+ <**
+ @description : Some special sources can have special behaviors, the are so called "Low Level Interrupts". Here the current status is documented. The information can be used by the AudioManagerController to react to the changes by for example lowering the volume of the mainSources. The two states are
+
+ IS_OFF: the interrupt is not active at the moment
+ IS_INTERRUPTED: the interrupt is playing at the moment.
+ **>
+ am_InterruptState_e interruptState
+
+ <**
+ @description : This is the list of soundProperties, that the source is capable of. The soundProperties itself are project specific. For sources, a possible soundProperty could be navigation volume offset, for example.
+ **>
+ am_SoundProperty_L listSoundProperties
+
+ <**
+ @description : This list holds information about the formats that the Source is capable of supporting when delivering audio.
+ **>
+ am_ConnectionFormat_L listConnectionFormats
+
+ <**
+ @description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface.
+ **>
+ am_MainSoundProperty_L listMainSoundProperties
+
+ <**
+ @description : The list of MainNotificationConfigurations. These notifications work on the level of CommandInterface.
+ **>
+ am_NotificationConfiguration_L listMainNotificationConfigurations
+
+ <**
+ @description : The list of MainNotificationConfigurations. These notifications work on the level of RoutingInterface.
+ **>
+ am_NotificationConfiguration_L listNotificationConfigurations
+ }
+
+ <**
+ @description : This struct describes the attribiutes of a domain
+ **>
+ struct am_Domain_s {
+
+ <**
+ @description : the domain ID
+ **>
+ am_domainID_t domainID
+
+ <**
+ @description : the name of the domain
+ **>
+ String name
+
+ <**
+ @description : the busname. This is equal to a plugin name and is used to dispatch messages to the elements of a plugin
+ **>
+ String busname
+
+ <**
+ @description : the name of the node
+ **>
+ String nodename
+
+ <**
+ @description : indicated if the domain is independent at startup or not
+ **>
+ Boolean early
+
+ <**
+ @description : indicates if the domain registration is complete or not
+ **>
+ Boolean complete
+
+ <**
+ @description : the current domain state
+ **>
+ am_DomainState_e ^state
+ }
+
+ struct am_EarlyData_s {
+ am_EarlyDataType_e type
+ am_DataType_u sinksource
+ am_EarlyData_u data
+ }
+
+ <**
+ @description : a connection
+ **>
+ struct am_Connection_s {
+
+ <**
+ @description : the assigned ID
+ **>
+ am_connectionID_t connectionID
+
+ <**
+ @description : the source the audio flows from
+ **>
+ am_sourceID_t sourceID
+
+ <**
+ @description : the sink the audio flows to
+ **>
+ am_sinkID_t sinkID
+
+ <**
+ @description : the delay of the conneciton
+ **>
+ am_timeSync_t delay
+
+ <**
+ @description : the used connectionformat
+ **>
+ am_ConnectionFormat_pe connectionFormat
+ }
+
+ <**
+ @description : This types describe a mixed description for source and sinks volumes.
+ **>
+ struct am_Volumes_s {
+
+ <**
+ @description : describes the type of the volume: source or sink.
+ **>
+ am_VolumeType_e volumeType
+
+ <**
+ @description : either sourceID or sinkID
+ **>
+ am_DataType_u volumeID
+
+ <**
+ @description : The volume
+ **>
+ am_volume_t volume
+
+ <**
+ @description : the ramp that shall be driven
+ **>
+ am_RampType_pe ramp
+
+ <**
+ @description : the time for the ramp
+ **>
+ am_time_t time
+ }
+
+ <**
+ @description : data type depends of am_EarlyDataType_e:
+volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME
+soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY
+ **>
+ union am_EarlyData_u {
+ am_volume_t volume
+ am_SoundProperty_s soundProperty
+ }
+
+ <**
+ @description : data type depends of am_EarlyDataType_e:
+sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY
+sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY
+ **>
+ union am_DataType_u {
+ am_sinkID_t sink
+ am_sourceID_t source
+ }
+
+} \ No newline at end of file
diff --git a/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fidl b/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fidl
deleted file mode 100755
index 6e6f224..0000000
--- a/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fidl
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.genivi.NodeStateManager.Consumer
-
-//interface org.genivi.NodeStateManager.Consumer {
-interface Consumer {
-
- version { major 0 minor 1 }
-
- attribute Int32 RestartReason
-
- attribute Int32 ShutdownReason
-
- attribute Int32 WakeUpReason
-
- attribute Int32 BootMode
-
- method GetNodeState {
- out {
- Int32 NodeStateId
- Int32 ErrorCode
- }
- }
- method SetSessionState {
- in {
- String SessionName
- String SessionOwner
- Int32 SeatID
- Int32 SessionState
- }
- out {
- Int32 ErrorCode
- }
- }
- method GetSessionState {
- in {
- String SessionName
- Int32 SeatID
- }
- out {
- Int32 SessionState
- Int32 ErrorCode
- }
- }
- method GetApplicationMode {
- out {
- Int32 ApplicationModeId
- Int32 ErrorCode
- }
- }
- method RegisterShutdownClient {
- in {
- String BusName
- String ObjName
- UInt32 ShutdownMode
- UInt32 TimeoutMs
- }
- out {
- Int32 ErrorCode
- }
- }
- method UnRegisterShutdownClient {
- in {
- String BusName
- String ObjName
- UInt32 ShutdownMode
- }
- out {
- Int32 ErrorCode
- }
- }
- method RegisterSession {
- in {
- String SessionName
- String SessionOwner
- Int32 SeatID
- Int32 SessionState
- }
- out {
- Int32 ErrorCode
- }
- }
- method UnRegisterSession {
- in {
- String SessionName
- String SessionOwner
- Int32 SeatID
- }
- out {
- Int32 ErrorCode
- }
- }
- method GetAppHealthCount {
- out {
- UInt32 Count
- }
- }
- method GetInterfaceVersion {
- out {
- UInt32 Version
- }
- }
- method LifecycleRequestComplete {
- in {
- UInt32 RequestId
- Int32 Status
- }
- out {
- Int32 ErrorCode
- }
- }
- broadcast NodeState {
- out {
- Int32 NodeState
- }
- }
- broadcast NodeApplicationMode {
- out {
- Int32 ApplicationModeId
- }
- }
- broadcast SessionStateChanged {
- out {
- String SessionStateName
- Int32 SeatID
- Int32 SessionState
- }
- }
-} \ No newline at end of file
diff --git a/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.LifecycleConsumer.fidl b/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.LifecycleConsumer.fidl
deleted file mode 100755
index e32c1c6..0000000
--- a/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.LifecycleConsumer.fidl
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.genivi.NodeStateManager.LifeCycleConsumer
-
-//interface org.genivi.NodeStateManager.LifeCycleConsumer {
-interface LifeCycleConsumer {
-
- version { major 0 minor 1 }
- method LifecycleRequest {
- in {
- UInt32 Request
- UInt32 RequestId
- }
- out {
- Int32 ErrorCode
- }
- }
-} \ No newline at end of file
diff --git a/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fdepl b/AudioManagerDaemon/fidls/NodeStateManager.fdepl
index b92bb71..624175f 100644
--- a/AudioManagerDaemon/fidls/NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fdepl
+++ b/AudioManagerDaemon/fidls/NodeStateManager.fdepl
@@ -1,6 +1,6 @@
import "platform:/plugin/org.genivi.commonapi.dbus/deployment/deployment.fdepl"
-import "NodeStateAccessStub_model_org.genivi.NodeStateManager.Consumer.fidl"
+import "NodeStateManager.fidl"
-define org.genivi.commonapi.dbus.deployment.deployment for interface org.genivi.NodeStateManager.Consumer.Consumer {
+define org.genivi.commonapi.dbus.deployment.deployment for interface org.genivi.NodeStateManager.Consumer {
PropertiesType=freedesktop
}
diff --git a/AudioManagerDaemon/fidls/NodeStateManager.fidl b/AudioManagerDaemon/fidls/NodeStateManager.fidl
new file mode 100644
index 0000000..84d8d26
--- /dev/null
+++ b/AudioManagerDaemon/fidls/NodeStateManager.fidl
@@ -0,0 +1,152 @@
+package org.genivi.NodeStateManager
+
+<**
+ @author : Christian Linke
+**>
+
+interface Consumer {
+ version {
+ major 1
+ minor 0
+ }
+
+ attribute Int32 BootMode readonly noSubscriptions
+
+ attribute Int32 RestartReason readonly noSubscriptions
+
+ attribute Int32 ShutdownReason readonly noSubscriptions
+
+ attribute Int32 WakeUpReason readonly noSubscriptions
+
+ method GetAppHealthCount {
+ out {
+ UInt32 Count
+ }
+ }
+ method LifecycleRequestComplete {
+ in {
+ UInt32 RequestId
+ Int32 Status
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+ method GetInterfaceVersion {
+ out {
+ UInt32 Version
+ }
+ }
+ method GetApplicationMode {
+ out {
+ Int32 ErrorCode
+ Int32 ApplicationModeId
+ }
+ }
+ method UnRegisterSession {
+ in {
+ String SessionName
+ String SessionOwner
+ Int32 SeatID
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+ method RegisterSession {
+ in {
+ String SessionName
+ String SessionOwner
+ Int32 SeatID
+ Int32 SessionState
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+ method UnRegisterShutdownClient {
+ in {
+ String BusName
+ String ObjName
+ UInt32 ShutdownMode
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+ method RegisterShutdownClient {
+ in {
+ String BusName
+ String ObjName
+ UInt32 ShutdownMode
+ UInt32 TimeoutMs
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+ method GetNodeState {
+ out {
+ Int32 ErrorCode
+ Int32 NodeStateId
+ }
+ }
+ method GetSessionState {
+ in {
+ String SessionName
+ Int32 SeatID
+ }
+ out {
+ Int32 SessionState
+ Int32 ErrorCode
+ }
+ }
+ method SetSessionState {
+ in {
+ String SessionName
+ String SessionOwner
+ Int32 SessionState
+ Int32 SeatID
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+ broadcast NodeApplicationMode {
+ out {
+ Int32 ApplicationModeId
+ }
+ }
+ broadcast SessionStateChanged {
+ out {
+ String SessionStateName
+ Int32 SeatID
+ Int32 SessionState
+ }
+ }
+ broadcast NodeState {
+ out {
+ Int32 NodeState
+ }
+ }
+}
+
+<**
+ @author : Christian Linke
+**>
+
+interface LifeCycleConsumer {
+ version {
+ major 1
+ minor 0
+ }
+ method LifecycleRequest {
+ in {
+ UInt32 Request
+ UInt32 RequestId
+ }
+ out {
+ Int32 ErrorCode
+ }
+ }
+} \ No newline at end of file
diff --git a/AudioManagerDaemon/fidls/amTypes.fidl b/AudioManagerDaemon/fidls/amTypes.fidl
deleted file mode 100755
index 9798dd7..0000000
--- a/AudioManagerDaemon/fidls/amTypes.fidl
+++ /dev/null
@@ -1,330 +0,0 @@
-package org.genivi
-
-typeCollection am
-{
- typedef am_sourceID_t is UInt16
- typedef am_sinkID_t is UInt16
- typedef am_gatewayID_t is UInt16
- typedef gongHandle is Int16
- typedef am_sourceClass_t is UInt16
- typedef am_sinkClass_t is UInt16
- typedef am_volume_t is Int16
- typedef am_mainVolume_t is Int16
- typedef am_handle_t is UInt16
- typedef am_time_t is UInt16
- typedef am_connectionID_t is UInt16
-
- enumeration gp_indicatorDirection_e
- {
- INDICATOR_RIGHT ="0x00"
- INDICATOR_LEFT="0x01"
- INDICATOR_WARNING="0x02"
- }
-
- enumeration am_RampType_e
- {
- RAMP_UNKNOWN = "0x00"
- RAMP_GENIVI_DIRECT = "0x01"
- RAMP_GENIVI_NO_PLOP = "0x02"
- RAMP_GENIVI_EXP_INV = "0x03"
- RAMP_GENIVI_LINEAR = "0x04"
- RAMP_GENIVI_EXP = "0x05"
- RAMP_MAX
- }
-
- enumeration am_MuteState_e
- {
- MS_UNKNOWN = "0x00"
- MS_MUTED = "0x01"
- MS_UNMUTED = "0x02"
- MS_MAX
- }
-
- enumeration am_SourceState_e
- {
- SS_UNKNNOWN = "0x00"
- SS_ON = "0x01"
- SS_OFF = "0x02"
- SS_PAUSED = "0x03"
- SS_MAX
- }
- enumeration am_Error_e
- {
- E_OK = "0x00"
- E_UNKNOWN = "0x01"
- E_OUT_OF_RANGE = "0x02"
- E_NOT_USED = "0x03"
- E_DATABASE_ERROR = "0x04"
- E_ALREADY_EXISTS = "0x05"
- E_NO_CHANGE = "0x06"
- E_NOT_POSSIBLE = "0x07"
- E_NON_EXISTENT = "0x08"
- E_ABORTED = "0x09"
- E_WRONG_FORMAT = "0xA"
- E_MAX
- }
-
- enumeration am_DomainState_e
- {
-
- DS_UNKNOWN = "0"
- DS_CONTROLLED = "1"
- DS_INDEPENDENT_STARTUP = "2"
- DS_INDEPENDENT_RUNDOWN = "3"
- DS_MAX
- }
-
- enumeration gongType_e
- {
- AT_NUN = "0x01"
- AT_POC = "0x02"
- AT_QUE = "0x03"
- AT_IWA = "0x04"
- AT_WA = "0x05"
- AT_ETC_F = "0x06"
- AT_ETC_F2 = "0x07"
- AT_ETC_ST = "0x08"
- AT_ETC_S = "0x09"
- AT_REV = "0x0A"
- AT_ESU = "0x0B"
- AT_ESD = "0x0C"
- AT_DG = "0x0D"
- AT_SG = "0x0E"
- AT_IDG = "0x0F"
- AT_ION = "0x10"
- AT_IOFF = "0x11"
- AT_FBS = "0x12"
- AT_VFS = "0x13"
- AT_GES = "0x14"
- AT_UEE = "0x15"
- }
-
- enumeration gp_indicatorStatus_e
- {
- IS_ON = "0x00"
- IS_OFF = "0x01"
- }
-
- enumeration gongStatus_e
- {
- NOT_PLAYING = "0x00"
- PLAYING = "0x01"
- INTERRUPTED = "0x02"
- }
-
- enumeration gongError_e
- {
- SUCCESS = "0x00"
- ERROR = "0x01"
- LOW_PRIORITY = "0x02"
- }
-
- enumeration gongClass_e
- {
- GONGCLASS_1 = "0x01"
- GONGCLASS_2 = "0x02"
- GONGCLASS_PDC = "0x03"
- GONGCLASS_TURN = "0x04"
- GONGCLASS_OBSTACLE = "0x05"
- }
-
- enumeration sampleSet_e
- {
- setBMW = "0x00"
- setMini = "0x01"
- setRR = "0x02"
- }
-
- enumeration am_Availability_e
- {
- A_UNKNOWN = "0x00"
- A_AVAILABLE = "0x01"
- A_UNAVAILABLE = "0x02"
- A_MAX
- }
- enumeration am_AvailabilityReason_e
- {
- AR_UNKNOWN = "0x00"
- AR_GENIVI_NEWMEDIA = "0x01"
- AR_GENIVI_SAMEMEDIA = "0x02"
- AR_GENIVI_NOMEDIA = "0x03"
- AR_GENIVI_TEMPERATURE = "0x04"
- AR_GENIVI_VOLTAGE = "0x05"
- AR_GENIVI_ERRORMEDIA = "0x06"
- AR_MAX
- }
-
- enumeration am_InterruptState_e
- {
- IS_UNKNOWN = "0x00"
- IS_OFF = "0x01"
- IS_INTERRUPTED = "0x02"
- IS_MAX
- }
-
- enumeration am_SoundPropertyType_e
- {
- SP_UNKNOWN = "0x00"
- SP_EXAMPLE_TREBLE = "0x01"
- SP_EXAMPLE_MID = "0x02"
- SP_EXAMPLE_BASS = "0x03"
- SP_ENTER_SINKID = "0x04"
- SP_INTERR_SUPERSEEDINGID = "0x05"
- SP_INTERR_OVERLAYID = "0x06"
- SP_PRIORITY = "0x07"
- SP_MAX
- }
-
- enumeration am_ConnectionFormat_e
- {
- CF_UNKNOWN = "0x00"
- CF_GENIVI_MONO = "0x01"
- CF_GENIVI_STEREO = "0x02"
- CF_GENIVI_ANALOG = "0x03"
- CF_GENIVI_AUTO = "0x04"
- CF_MAX
- }
- array am_ConnectionFormat_L of am_ConnectionFormat_e
-
- enumeration am_MainSoundPropertyType_e
- {
- MSP_UNKNOWN = "0x00"
- MSP_EXAMPLE_TREBLE = "0x01"
- MSP_EXAMPLE_MID = "0x02"
- MSP_EXAMPLE_BASS = "0x03"
- MSP_SOURCE_TYPE = "0x04"
- MSP_MAX
- }
-
- enumeration am_NotificationType_e
- {
- NT_UNKNOWN = "0x00"
- NT_LOUDNESS = "0x01"
- NT_MAX
- }
-
- enumeration am_NotificationStatus_e
- {
- NS_UNKNOWN = "0x00"
- NS_OFF = "0x01"
- NS_PERIODIC = "0x02"
- NS_MINIMUM = "0x03"
- NS_MAXIMUM = "0x04"
- NS_CHANGE = "0x05"
- NS_MAX
- }
-
- struct distanceInformation_s
- {
- Int32 FrontLeft
- Int32 FrontRight
- Int32 RearLeft
- Int32 RearRight
- }
-
- struct sampleNames_s
- {
- sampleSet_e sample
- String sampleName
- } array listSampleNamesL of sampleNames_s
-
- typedef am_domainID_t is UInt16
-
- struct am_Domain_s
- {
- am_domainID_t domainID
- String name
- String busname
- String nodename
- Boolean early
- Boolean complete
- am_DomainState_e ^state
- }
-
- struct notificationPayload_s
- {
- Int16 type
- Int16 payload
- }
-
- struct am_Availability_s
- {
- am_Availability_e availability
- am_AvailabilityReason_e availabilityReason
- }
-
- struct am_SoundProperty_s
- {
- am_SoundPropertyType_e type
- Int16 value
- }
- array am_SoundProperty_L of am_SoundProperty_s
-
- struct am_MainSoundProperty_s
- {
- am_MainSoundPropertyType_e type
- Int16 value
- }
- array am_MainSoundProperty_L of am_MainSoundProperty_s
-
- struct am_NotificationConfiguration_s
- {
- am_NotificationType_e type
- am_NotificationStatus_e status
- Int16 parameter
- }
- array am_NotificationConfiguration_L of am_NotificationConfiguration_s
-
-
- array bool_L of Boolean
-
- struct sourceData_s
- {
- am_sourceID_t sourceID
- am_domainID_t domainID
- String name
- am_sourceClass_t sourceClassID
- am_SourceState_e sourceState
- am_volume_t volume
- Boolean visible
- am_Availability_s available
- am_InterruptState_e interruptState
- am_SoundProperty_L listSoundProperties
- am_ConnectionFormat_L listConnectionFormats
- am_MainSoundProperty_L listMainSoundProperties
- am_NotificationConfiguration_L listMainNotificationConfigurations
- am_NotificationConfiguration_L listNotificationConfigurations
- }
-
- struct sinkData_s
- {
- am_sinkID_t sinkID
- String name
- am_domainID_t domainID
- am_sinkClass_t sinkClassID
- am_volume_t volume
- Boolean visible
- am_Availability_s available
- am_MuteState_e muteState
- am_mainVolume_t mainVolume
- am_SoundProperty_L listSoundProperties
- am_ConnectionFormat_L listConnectionFormats
- am_MainSoundProperty_L listMainSoundProperties
- am_NotificationConfiguration_L listMainNotificationConfigurations
- am_NotificationConfiguration_L listNotificationConfigurations
- }
-
- struct am_Gateway_s
- {
- am_gatewayID_t gatewayID
- String name
- am_sinkID_t sinkID
- am_sourceID_t sourceID
- am_domainID_t domainSinkID
- am_domainID_t domainSourceID
- am_domainID_t controlDomainID
- am_ConnectionFormat_L listSourceFormats
- am_ConnectionFormat_L listSinkFormats
- bool_L convertionMatrix
- }
-} \ No newline at end of file
diff --git a/AudioManagerDaemon/include/CAmNodeStateCommunicatorCAPI.h b/AudioManagerDaemon/include/CAmNodeStateCommunicatorCAPI.h
index 6c063e5..0c3ae71 100644
--- a/AudioManagerDaemon/include/CAmNodeStateCommunicatorCAPI.h
+++ b/AudioManagerDaemon/include/CAmNodeStateCommunicatorCAPI.h
@@ -21,15 +21,14 @@
#ifndef CAMNODESTATECOMMUNICATORCAPI_H_
#define CAMNODESTATECOMMUNICATORCAPI_H_
-#include <org/genivi/NodeStateManager/Consumer/ConsumerProxy.h>
+#include <org/genivi/NodeStateManager/ConsumerProxy.h>
#include "CAmNodeStateCommunicator.h"
-#include "LifeCycleConsumerStubDefault.h"
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h>
namespace am
{
using namespace CommonAPI;
-using namespace org::genivi::NodeStateManager::Consumer;
-using namespace org::genivi::NodeStateManager::LifeCycleConsumer;
+using namespace org::genivi::NodeStateManager;
class CAmCommonAPIWrapper;
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
new file mode 100644
index 0000000..026f431
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
@@ -0,0 +1,55 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2013, BMW AG
+ *
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
+
+
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/types.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+class Consumer {
+ public:
+ virtual ~Consumer() { }
+
+ static inline const char* getInterfaceId();
+ static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* Consumer::getInterfaceId() {
+ return "org.genivi.NodeStateManager.Consumer";
+}
+
+CommonAPI::Version Consumer::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+
+}
+
+
+namespace std {
+ //hashes for types
+
+ //hashes for error types
+}
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h
deleted file mode 100644
index 345bd3b..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace Consumer {
-
-class Consumer {
- public:
- virtual ~Consumer() { }
-
- static inline const char* getInterfaceId();
- static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* Consumer::getInterfaceId() {
- return "org.genivi.NodeStateManager.Consumer.Consumer";
-}
-
-CommonAPI::Version Consumer::getInterfaceVersion() {
- return CommonAPI::Version(0, 1);
-}
-
-
-} // namespace Consumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
- //hashes for types
-
- //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp
deleted file mode 100644
index a72ba16..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#include "ConsumerDBusStubAdapter.h"
-#include <org/genivi/NodeStateManager/Consumer/Consumer.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace Consumer {
-
-std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createConsumerDBusStubAdapter(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection,
- const std::shared_ptr<CommonAPI::StubBase>& stubBase) {
- return std::make_shared<ConsumerDBusStubAdapter>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
-}
-
-__attribute__((constructor)) void registerConsumerDBusStubAdapter(void) {
- CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(Consumer::getInterfaceId(),
- &createConsumerDBusStubAdapter);
-}
-
-ConsumerDBusStubAdapter::ConsumerDBusStubAdapter(
- const std::string& commonApiAddress,
- const std::string& dbusInterfaceName,
- const std::string& dbusBusName,
- const std::string& dbusObjectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
- const std::shared_ptr<CommonAPI::StubBase>& stub):
- ConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast<ConsumerStub>(stub)) {
-}
-
-const char* ConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
- return
- "<method name=\"getRestartReasonAttribute\">\n"
- "<arg name=\"value\" type=\"i\" direction=\"out\" />"
- "</method>\n"
- "<method name=\"setRestartReasonAttribute\">\n"
- "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<signal name=\"onRestartReasonAttributeChanged\">\n"
- "<arg name=\"changedValue\" type=\"i\" />\n"
- "</signal>\n"
- "<method name=\"getShutdownReasonAttribute\">\n"
- "<arg name=\"value\" type=\"i\" direction=\"out\" />"
- "</method>\n"
- "<method name=\"setShutdownReasonAttribute\">\n"
- "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<signal name=\"onShutdownReasonAttributeChanged\">\n"
- "<arg name=\"changedValue\" type=\"i\" />\n"
- "</signal>\n"
- "<method name=\"getWakeUpReasonAttribute\">\n"
- "<arg name=\"value\" type=\"i\" direction=\"out\" />"
- "</method>\n"
- "<method name=\"setWakeUpReasonAttribute\">\n"
- "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<signal name=\"onWakeUpReasonAttributeChanged\">\n"
- "<arg name=\"changedValue\" type=\"i\" />\n"
- "</signal>\n"
- "<method name=\"getBootModeAttribute\">\n"
- "<arg name=\"value\" type=\"i\" direction=\"out\" />"
- "</method>\n"
- "<method name=\"setBootModeAttribute\">\n"
- "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<signal name=\"onBootModeAttributeChanged\">\n"
- "<arg name=\"changedValue\" type=\"i\" />\n"
- "</signal>\n"
- "<signal name=\"NodeState\">\n"
- "<arg name=\"NodeState\" type=\"i\" />\n"
- "</signal>\n"
- "<signal name=\"NodeApplicationMode\">\n"
- "<arg name=\"ApplicationModeId\" type=\"i\" />\n"
- "</signal>\n"
- "<signal name=\"SessionStateChanged\">\n"
- "<arg name=\"SessionStateName\" type=\"s\" />\n"
- "<arg name=\"SeatID\" type=\"i\" />\n"
- "<arg name=\"SessionState\" type=\"i\" />\n"
- "</signal>\n"
- "<method name=\"GetNodeState\">\n"
- "<arg name=\"NodeStateId\" type=\"i\" direction=\"out\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"SetSessionState\">\n"
- "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"GetSessionState\">\n"
- "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"SessionState\" type=\"i\" direction=\"out\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"GetApplicationMode\">\n"
- "<arg name=\"ApplicationModeId\" type=\"i\" direction=\"out\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"RegisterShutdownClient\">\n"
- "<arg name=\"BusName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"ObjName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"ShutdownMode\" type=\"u\" direction=\"in\" />\n"
- "<arg name=\"TimeoutMs\" type=\"u\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"UnRegisterShutdownClient\">\n"
- "<arg name=\"BusName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"ObjName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"ShutdownMode\" type=\"u\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"RegisterSession\">\n"
- "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"UnRegisterSession\">\n"
- "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
- "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"GetAppHealthCount\">\n"
- "<arg name=\"Count\" type=\"u\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"GetInterfaceVersion\">\n"
- "<arg name=\"Version\" type=\"u\" direction=\"out\" />\n"
- "</method>\n"
- "<method name=\"LifecycleRequestComplete\">\n"
- "<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
- "<arg name=\"Status\" type=\"i\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- ;
-}
-
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > setRestartReasonAttributeStubDispatcher(
- &ConsumerStub::getRestartReasonAttribute,
- &ConsumerStubRemoteEvent::onRemoteSetRestartReasonAttribute,
- &ConsumerStubRemoteEvent::onRemoteRestartReasonAttributeChanged,
- &ConsumerStubAdapter::fireRestartReasonAttributeChanged,
- "i");
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > setShutdownReasonAttributeStubDispatcher(
- &ConsumerStub::getShutdownReasonAttribute,
- &ConsumerStubRemoteEvent::onRemoteSetShutdownReasonAttribute,
- &ConsumerStubRemoteEvent::onRemoteShutdownReasonAttributeChanged,
- &ConsumerStubAdapter::fireShutdownReasonAttributeChanged,
- "i");
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > setWakeUpReasonAttributeStubDispatcher(
- &ConsumerStub::getWakeUpReasonAttribute,
- &ConsumerStubRemoteEvent::onRemoteSetWakeUpReasonAttribute,
- &ConsumerStubRemoteEvent::onRemoteWakeUpReasonAttributeChanged,
- &ConsumerStubAdapter::fireWakeUpReasonAttributeChanged,
- "i");
-
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute, "i");
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
- ConsumerStub,
- int32_t
- > setBootModeAttributeStubDispatcher(
- &ConsumerStub::getBootModeAttribute,
- &ConsumerStubRemoteEvent::onRemoteSetBootModeAttribute,
- &ConsumerStubRemoteEvent::onRemoteBootModeAttributeChanged,
- &ConsumerStubAdapter::fireBootModeAttributeChanged,
- "i");
-
-
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<>,
- std::tuple<int32_t, int32_t>
- > getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<std::string, std::string, int32_t, int32_t>,
- std::tuple<int32_t>
- > setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<std::string, int32_t>,
- std::tuple<int32_t, int32_t>
- > getSessionStateStubDispatcher(&ConsumerStub::GetSessionState, "ii");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<>,
- std::tuple<int32_t, int32_t>
- > getApplicationModeStubDispatcher(&ConsumerStub::GetApplicationMode, "ii");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<std::string, std::string, uint32_t, uint32_t>,
- std::tuple<int32_t>
- > registerShutdownClientStubDispatcher(&ConsumerStub::RegisterShutdownClient, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<std::string, std::string, uint32_t>,
- std::tuple<int32_t>
- > unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<std::string, std::string, int32_t, int32_t>,
- std::tuple<int32_t>
- > registerSessionStubDispatcher(&ConsumerStub::RegisterSession, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<std::string, std::string, int32_t>,
- std::tuple<int32_t>
- > unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "i");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<>,
- std::tuple<uint32_t>
- > getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<>,
- std::tuple<uint32_t>
- > getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u");
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- ConsumerStub,
- std::tuple<uint32_t, int32_t>,
- std::tuple<int32_t>
- > lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i");
-
-void ConsumerDBusStubAdapter::fireRestartReasonAttributeChanged(const int32_t& value) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
- ::sendSignal(
- *this,
- "onRestartReasonAttributeChanged",
- "i",
- value
- );
-}
-void ConsumerDBusStubAdapter::fireShutdownReasonAttributeChanged(const int32_t& value) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
- ::sendSignal(
- *this,
- "onShutdownReasonAttributeChanged",
- "i",
- value
- );
-}
-void ConsumerDBusStubAdapter::fireWakeUpReasonAttributeChanged(const int32_t& value) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
- ::sendSignal(
- *this,
- "onWakeUpReasonAttributeChanged",
- "i",
- value
- );
-}
-void ConsumerDBusStubAdapter::fireBootModeAttributeChanged(const int32_t& value) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
- ::sendSignal(
- *this,
- "onBootModeAttributeChanged",
- "i",
- value
- );
-}
-
-void ConsumerDBusStubAdapter::fireNodeStateEvent(const int32_t& NodeState) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
- ::sendSignal(
- *this,
- "NodeState",
- "i",
- NodeState
- );
-}
-void ConsumerDBusStubAdapter::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
- ::sendSignal(
- *this,
- "NodeApplicationMode",
- "i",
- ApplicationModeId
- );
-}
-void ConsumerDBusStubAdapter::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
- CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t, int32_t>>
- ::sendSignal(
- *this,
- "SessionStateChanged",
- "sii",
- SessionStateName, SeatID, SessionState
- );
-}
-
-} // namespace Consumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-template<>
-const org::genivi::NodeStateManager::Consumer::ConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::Consumer::ConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
- { { "getRestartReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getRestartReasonAttributeStubDispatcher }
- , { { "setRestartReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setRestartReasonAttributeStubDispatcher },
- { { "getShutdownReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getShutdownReasonAttributeStubDispatcher }
- , { { "setShutdownReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setShutdownReasonAttributeStubDispatcher },
- { { "getWakeUpReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getWakeUpReasonAttributeStubDispatcher }
- , { { "setWakeUpReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setWakeUpReasonAttributeStubDispatcher },
- { { "getBootModeAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getBootModeAttributeStubDispatcher }
- , { { "setBootModeAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setBootModeAttributeStubDispatcher }
- ,
- { { "GetNodeState", "" }, &org::genivi::NodeStateManager::Consumer::getNodeStateStubDispatcher },
- { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::Consumer::setSessionStateStubDispatcher },
- { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::Consumer::getSessionStateStubDispatcher },
- { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::Consumer::getApplicationModeStubDispatcher },
- { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::Consumer::registerShutdownClientStubDispatcher },
- { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::Consumer::unRegisterShutdownClientStubDispatcher },
- { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::Consumer::registerSessionStubDispatcher },
- { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::Consumer::unRegisterSessionStubDispatcher },
- { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::Consumer::getAppHealthCountStubDispatcher },
- { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::Consumer::getInterfaceVersionStubDispatcher },
- { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::Consumer::lifecycleRequestCompleteStubDispatcher }
-};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h
deleted file mode 100644
index 8b43c21..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
-
-#include <org/genivi/NodeStateManager/Consumer/ConsumerStub.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
-#include <CommonAPI/DBus/DBusFactory.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace Consumer {
-
-typedef CommonAPI::DBus::DBusStubAdapterHelper<ConsumerStub> ConsumerDBusStubAdapterHelper;
-
-class ConsumerDBusStubAdapter: public ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper {
- public:
- ConsumerDBusStubAdapter(
- const std::string& commonApiAddress,
- const std::string& dbusInterfaceName,
- const std::string& dbusBusName,
- const std::string& dbusObjectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
- const std::shared_ptr<CommonAPI::StubBase>& stub);
-
- void fireRestartReasonAttributeChanged(const int32_t& value);
- void fireShutdownReasonAttributeChanged(const int32_t& value);
- void fireWakeUpReasonAttributeChanged(const int32_t& value);
- void fireBootModeAttributeChanged(const int32_t& value);
-
- void fireNodeStateEvent(const int32_t& NodeState);
- void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
- void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
-
- protected:
- virtual const char* getMethodsDBusIntrospectionXmlData() const;
-};
-
-} // namespace Consumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
index e920d51..202680d 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
@@ -1,29 +1,15 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
#include "ConsumerDBusProxy.h"
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace Consumer {
std::shared_ptr<CommonAPI::DBus::DBusProxy> createConsumerDBusProxy(
const std::string& commonApiAddress,
@@ -46,16 +32,19 @@ ConsumerDBusProxy::ConsumerDBusProxy(
const std::string& objectPath,
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
-, restartReason_(*this, interfaceName.c_str(), "RestartReason"),
+, bootMode_(*this, interfaceName.c_str(), "BootMode"),
+ restartReason_(*this, interfaceName.c_str(), "RestartReason"),
shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"),
- wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason"),
- bootMode_(*this, interfaceName.c_str(), "BootMode")
-, nodeState_(*this, "NodeState", "i"),
- nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
- sessionStateChanged_(*this, "SessionStateChanged", "sii")
+ wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason")
+, nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
+ sessionStateChanged_(*this, "SessionStateChanged", "sii"),
+ nodeState_(*this, "NodeState", "i")
{
}
+ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
+ return bootMode_;
+}
ConsumerDBusProxy::RestartReasonAttribute& ConsumerDBusProxy::getRestartReasonAttribute() {
return restartReason_;
}
@@ -65,83 +54,78 @@ ConsumerDBusProxy::ShutdownReasonAttribute& ConsumerDBusProxy::getShutdownReason
ConsumerDBusProxy::WakeUpReasonAttribute& ConsumerDBusProxy::getWakeUpReasonAttribute() {
return wakeUpReason_;
}
-ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
- return bootMode_;
-}
-ConsumerDBusProxy::NodeStateEvent& ConsumerDBusProxy::getNodeStateEvent() {
- return nodeState_;
-}
ConsumerDBusProxy::NodeApplicationModeEvent& ConsumerDBusProxy::getNodeApplicationModeEvent() {
return nodeApplicationMode_;
}
ConsumerDBusProxy::SessionStateChangedEvent& ConsumerDBusProxy::getSessionStateChangedEvent() {
return sessionStateChanged_;
}
+ConsumerDBusProxy::NodeStateEvent& ConsumerDBusProxy::getNodeStateEvent() {
+ return nodeState_;
+}
-void ConsumerDBusProxy::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) {
+void ConsumerDBusProxy::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+ CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
*this,
- "GetNodeState",
+ "GetAppHealthCount",
"",
callStatus
- , NodeStateId, ErrorCode);
+ , Count);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+ CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
*this,
- "GetNodeState",
+ "GetAppHealthCount",
"",
std::move(callback));
}
-void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
*this,
- "SetSessionState",
- "ssii",
- SessionName, SessionOwner, SeatID, SessionState,
+ "LifecycleRequestComplete",
+ "ui",
+ RequestId, Status,
callStatus
, ErrorCode);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
*this,
- "SetSessionState",
- "ssii",
- SessionName, SessionOwner, SeatID, SessionState,
+ "LifecycleRequestComplete",
+ "ui",
+ RequestId, Status,
std::move(callback));
}
-void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+void ConsumerDBusProxy::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+ CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
*this,
- "GetSessionState",
- "si",
- SessionName, SeatID,
+ "GetInterfaceVersion",
+ "",
callStatus
- , SessionState, ErrorCode);
+ , Version);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+ CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
*this,
- "GetSessionState",
- "si",
- SessionName, SeatID,
+ "GetInterfaceVersion",
+ "",
std::move(callback));
}
-void ConsumerDBusProxy::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) {
+void ConsumerDBusProxy::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) {
CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
*this,
"GetApplicationMode",
"",
callStatus
- , ApplicationModeId, ErrorCode);
+ , ErrorCode, ApplicationModeId);
}
std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) {
return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
@@ -151,42 +135,23 @@ std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetApplicationModeAsync(Ge
"",
std::move(callback));
}
-void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "RegisterShutdownClient",
- "ssuu",
- BusName, ObjName, ShutdownMode, TimeoutMs,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "RegisterShutdownClient",
- "ssuu",
- BusName, ObjName, ShutdownMode, TimeoutMs,
- std::move(callback));
-}
-void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
+void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
*this,
- "UnRegisterShutdownClient",
- "ssu",
- BusName, ObjName, ShutdownMode,
+ "UnRegisterSession",
+ "ssi",
+ SessionName, SessionOwner, SeatID,
callStatus
, ErrorCode);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
*this,
- "UnRegisterShutdownClient",
- "ssu",
- BusName, ObjName, ShutdownMode,
+ "UnRegisterSession",
+ "ssi",
+ SessionName, SessionOwner, SeatID,
std::move(callback));
}
void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
@@ -208,85 +173,105 @@ std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterSessionAsync(const
SessionName, SessionOwner, SeatID, SessionState,
std::move(callback));
}
-void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
+void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
*this,
- "UnRegisterSession",
- "ssi",
- SessionName, SessionOwner, SeatID,
+ "UnRegisterShutdownClient",
+ "ssu",
+ BusName, ObjName, ShutdownMode,
callStatus
, ErrorCode);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
*this,
- "UnRegisterSession",
- "ssi",
- SessionName, SessionOwner, SeatID,
+ "UnRegisterShutdownClient",
+ "ssu",
+ BusName, ObjName, ShutdownMode,
std::move(callback));
}
-void ConsumerDBusProxy::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
+void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
+ CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
*this,
- "GetAppHealthCount",
- "",
+ "RegisterShutdownClient",
+ "ssuu",
+ BusName, ObjName, ShutdownMode, TimeoutMs,
callStatus
- , Count);
+ , ErrorCode);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
+ CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
*this,
- "GetAppHealthCount",
- "",
+ "RegisterShutdownClient",
+ "ssuu",
+ BusName, ObjName, ShutdownMode, TimeoutMs,
std::move(callback));
}
-void ConsumerDBusProxy::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+void ConsumerDBusProxy::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) {
CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
+ CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
*this,
- "GetInterfaceVersion",
+ "GetNodeState",
"",
callStatus
- , Version);
+ , ErrorCode, NodeStateId);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
+ CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
*this,
- "GetInterfaceVersion",
+ "GetNodeState",
"",
std::move(callback));
}
-void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
+void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
+ CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+ *this,
+ "GetSessionState",
+ "si",
+ SessionName, SeatID,
+ callStatus
+ , SessionState, ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
+ CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+ *this,
+ "GetSessionState",
+ "si",
+ SessionName, SeatID,
+ std::move(callback));
+}
+void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
*this,
- "LifecycleRequestComplete",
- "ui",
- RequestId, Status,
+ "SetSessionState",
+ "ssii",
+ SessionName, SessionOwner, SessionState, SeatID,
callStatus
, ErrorCode);
}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
*this,
- "LifecycleRequestComplete",
- "ui",
- RequestId, Status,
+ "SetSessionState",
+ "ssii",
+ SessionName, SessionOwner, SessionState, SeatID,
std::move(callback));
}
void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
- ownVersionMajor = 0;
- ownVersionMinor = 1;
+ ownVersionMajor = 1;
+ ownVersionMinor = 0;
}
-} // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
index c3db1df..fe17687 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
@@ -1,27 +1,14 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
-#include <org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h>
+#include <org/genivi/NodeStateManager/ConsumerProxyBase.h>
#define COMMONAPI_INTERNAL_COMPILATION
@@ -37,7 +24,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace Consumer {
class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
public:
@@ -50,65 +36,64 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common
virtual ~ConsumerDBusProxy() { }
+ virtual BootModeAttribute& getBootModeAttribute();
virtual RestartReasonAttribute& getRestartReasonAttribute();
virtual ShutdownReasonAttribute& getShutdownReasonAttribute();
virtual WakeUpReasonAttribute& getWakeUpReasonAttribute();
- virtual BootModeAttribute& getBootModeAttribute();
- virtual NodeStateEvent& getNodeStateEvent();
virtual NodeApplicationModeEvent& getNodeApplicationModeEvent();
virtual SessionStateChangedEvent& getSessionStateChangedEvent();
+ virtual NodeStateEvent& getNodeStateEvent();
- virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
+ virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
+ virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
- virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback);
+ virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
- virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+ virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
+ virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
- virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode);
+ virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId);
virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
- virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
-
- virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
+ virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
- virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
+ virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
- virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
- virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
+ virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
- virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
- virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
+ virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId);
+ virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
- virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
+ virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
+ virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+
+ virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
private:
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<RestartReasonAttribute>> restartReason_;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<ShutdownReasonAttribute>> shutdownReason_;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<WakeUpReasonAttribute>> wakeUpReason_;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<BootModeAttribute>> bootMode_;
+ CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<BootModeAttribute> bootMode_;
+ CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<RestartReasonAttribute> restartReason_;
+ CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
+ CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
- CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_;
CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_;
+ CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
};
-} // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
index 273fa8b..e0aab4d 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
@@ -1,25 +1,12 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
#include "ConsumerProxyBase.h"
@@ -33,7 +20,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace Consumer {
template <typename ... _AttributeExtensions>
class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, public _AttributeExtensions... {
@@ -41,6 +27,11 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
~ConsumerProxy();
+ /// Returns the wrapper class that provides access to the attribute BootMode.
+ virtual BootModeAttribute& getBootModeAttribute() {
+ return delegate_->getBootModeAttribute();
+ }
+
/// Returns the wrapper class that provides access to the attribute RestartReason.
virtual RestartReasonAttribute& getRestartReasonAttribute() {
return delegate_->getRestartReasonAttribute();
@@ -56,16 +47,6 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
return delegate_->getWakeUpReasonAttribute();
}
- /// Returns the wrapper class that provides access to the attribute BootMode.
- virtual BootModeAttribute& getBootModeAttribute() {
- return delegate_->getBootModeAttribute();
- }
-
-
- /// Returns the wrapper class that provides access to the broadcast NodeState.
- virtual NodeStateEvent& getNodeStateEvent() {
- return delegate_->getNodeStateEvent();
- }
/// Returns the wrapper class that provides access to the broadcast NodeApplicationMode.
virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() {
@@ -77,10 +58,15 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
return delegate_->getSessionStateChangedEvent();
}
+ /// Returns the wrapper class that provides access to the broadcast NodeState.
+ virtual NodeStateEvent& getNodeStateEvent() {
+ return delegate_->getNodeStateEvent();
+ }
+
/**
- * Calls GetNodeState with synchronous semantics.
+ * Calls GetAppHealthCount with synchronous semantics.
*
* All non-const parameters will be filled with the returned values.
* The CallStatus will be filled when the method returns and indicate either
@@ -88,9 +74,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode);
+ virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
/**
- * Calls GetNodeState with asynchronous semantics.
+ * Calls GetAppHealthCount with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -99,10 +85,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
/**
- * Calls SetSessionState with synchronous semantics.
+ * Calls LifecycleRequestComplete with synchronous semantics.
*
* All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
@@ -111,9 +97,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
/**
- * Calls SetSessionState with asynchronous semantics.
+ * Calls LifecycleRequestComplete with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -122,21 +108,20 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
/**
- * Calls GetSessionState with synchronous semantics.
+ * Calls GetInterfaceVersion with synchronous semantics.
*
- * All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
* The CallStatus will be filled when the method returns and indicate either
* "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
+ virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
/**
- * Calls GetSessionState with asynchronous semantics.
+ * Calls GetInterfaceVersion with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -145,7 +130,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
/**
* Calls GetApplicationMode with synchronous semantics.
@@ -156,7 +141,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode);
+ virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId);
/**
* Calls GetApplicationMode with asynchronous semantics.
*
@@ -170,7 +155,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
/**
- * Calls RegisterShutdownClient with synchronous semantics.
+ * Calls UnRegisterSession with synchronous semantics.
*
* All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
@@ -179,9 +164,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
/**
- * Calls RegisterShutdownClient with asynchronous semantics.
+ * Calls UnRegisterSession with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -190,10 +175,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
/**
- * Calls UnRegisterShutdownClient with synchronous semantics.
+ * Calls RegisterSession with synchronous semantics.
*
* All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
@@ -202,9 +187,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
/**
- * Calls UnRegisterShutdownClient with asynchronous semantics.
+ * Calls RegisterSession with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -213,10 +198,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
/**
- * Calls RegisterSession with synchronous semantics.
+ * Calls UnRegisterShutdownClient with synchronous semantics.
*
* All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
@@ -225,9 +210,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
/**
- * Calls RegisterSession with asynchronous semantics.
+ * Calls UnRegisterShutdownClient with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -236,10 +221,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
/**
- * Calls UnRegisterSession with synchronous semantics.
+ * Calls RegisterShutdownClient with synchronous semantics.
*
* All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
@@ -248,9 +233,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
/**
- * Calls UnRegisterSession with asynchronous semantics.
+ * Calls RegisterShutdownClient with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -259,10 +244,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
/**
- * Calls GetAppHealthCount with synchronous semantics.
+ * Calls GetNodeState with synchronous semantics.
*
* All non-const parameters will be filled with the returned values.
* The CallStatus will be filled when the method returns and indicate either
@@ -270,9 +255,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
+ virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId);
/**
- * Calls GetAppHealthCount with asynchronous semantics.
+ * Calls GetNodeState with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -281,20 +266,21 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
/**
- * Calls GetInterfaceVersion with synchronous semantics.
+ * Calls GetSessionState with synchronous semantics.
*
+ * All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
* The CallStatus will be filled when the method returns and indicate either
* "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
+ virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
/**
- * Calls GetInterfaceVersion with asynchronous semantics.
+ * Calls GetSessionState with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -303,10 +289,10 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
/**
- * Calls LifecycleRequestComplete with synchronous semantics.
+ * Calls SetSessionState with synchronous semantics.
*
* All const parameters are input parameters to this method.
* All non-const parameters will be filled with the returned values.
@@ -315,9 +301,9 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+ virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
/**
- * Calls LifecycleRequestComplete with asynchronous semantics.
+ * Calls SetSessionState with asynchronous semantics.
*
* The provided callback will be called when the reply to this call arrives or
* an error occurs during the call. The CallStatus will indicate either "SUCCESS"
@@ -326,7 +312,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* The std::future returned by this method will be fulfilled at arrival of the reply.
* It will provide the same value for CallStatus as will be handed to the callback.
*/
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
/// Returns the CommonAPI address of the remote partner this proxy communicates with.
virtual std::string getAddress() const;
@@ -361,6 +347,25 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
namespace ConsumerExtensions {
template <template <typename > class _ExtensionType>
+ class BootModeAttributeExtension {
+ public:
+ typedef _ExtensionType<ConsumerProxyBase::BootModeAttribute> extension_type;
+
+ static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value,
+ "Not CommonAPI Attribute Extension!");
+
+ BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) {
+ }
+
+ inline extension_type& getBootModeAttributeExtension() {
+ return attributeExtension_;
+ }
+
+ private:
+ extension_type attributeExtension_;
+ };
+
+ template <template <typename > class _ExtensionType>
class RestartReasonAttributeExtension {
public:
typedef _ExtensionType<ConsumerProxyBase::RestartReasonAttribute> extension_type;
@@ -417,25 +422,6 @@ namespace ConsumerExtensions {
extension_type attributeExtension_;
};
- template <template <typename > class _ExtensionType>
- class BootModeAttributeExtension {
- public:
- typedef _ExtensionType<ConsumerProxyBase::BootModeAttribute> extension_type;
-
- static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value,
- "Not CommonAPI Attribute Extension!");
-
- BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) {
- }
-
- inline extension_type& getBootModeAttributeExtension() {
- return attributeExtension_;
- }
-
- private:
- extension_type attributeExtension_;
- };
-
} // namespace ConsumerExtensions
//
@@ -452,38 +438,38 @@ ConsumerProxy<_AttributeExtensions...>::~ConsumerProxy() {
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) {
- delegate_->GetNodeState(callStatus, NodeStateId, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
+ delegate_->GetAppHealthCount(callStatus, Count);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
- return delegate_->GetNodeStateAsync(callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
+ return delegate_->GetAppHealthCountAsync(callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->SetSessionState(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) {
- return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
+ return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
- delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+ delegate_->GetInterfaceVersion(callStatus, Version);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
- return delegate_->GetSessionStateAsync(SessionName, SeatID, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+ return delegate_->GetInterfaceVersionAsync(callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) {
- delegate_->GetApplicationMode(callStatus, ApplicationModeId, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) {
+ delegate_->GetApplicationMode(callStatus, ErrorCode, ApplicationModeId);
}
template <typename ... _AttributeExtensions>
@@ -492,73 +478,73 @@ std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAp
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
- return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
+ return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
- return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
+ return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
- return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
+ return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
- return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
+ return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
- delegate_->GetAppHealthCount(callStatus, Count);
+void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) {
+ delegate_->GetNodeState(callStatus, ErrorCode, NodeStateId);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
- return delegate_->GetAppHealthCountAsync(callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
+ return delegate_->GetNodeStateAsync(callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
- delegate_->GetInterfaceVersion(callStatus, Version);
+void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
+ delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
- return delegate_->GetInterfaceVersionAsync(callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
+ return delegate_->GetSessionStateAsync(SessionName, SeatID, callback);
}
template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode);
+void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+ delegate_->SetSessionState(SessionName, SessionOwner, SessionState, SeatID, callStatus, ErrorCode);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
- return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback);
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) {
+ return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SessionState, SeatID, callback);
}
@@ -597,23 +583,22 @@ CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::ge
return delegate_->getInterfaceVersionAttribute();
}
-} // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
namespace CommonAPI {
template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyFactoryHelper<org::genivi::NodeStateManager::Consumer::ConsumerProxy,
+struct DefaultAttributeProxyFactoryHelper<org::genivi::NodeStateManager::ConsumerProxy,
_AttributeExtension> {
- typedef typename org::genivi::NodeStateManager::Consumer::ConsumerProxy<
- org::genivi::NodeStateManager::Consumer::ConsumerExtensions::RestartReasonAttributeExtension<_AttributeExtension>,
- org::genivi::NodeStateManager::Consumer::ConsumerExtensions::ShutdownReasonAttributeExtension<_AttributeExtension>,
- org::genivi::NodeStateManager::Consumer::ConsumerExtensions::WakeUpReasonAttributeExtension<_AttributeExtension>,
- org::genivi::NodeStateManager::Consumer::ConsumerExtensions::BootModeAttributeExtension<_AttributeExtension>
+ typedef typename org::genivi::NodeStateManager::ConsumerProxy<
+ org::genivi::NodeStateManager::ConsumerExtensions::BootModeAttributeExtension<_AttributeExtension>,
+ org::genivi::NodeStateManager::ConsumerExtensions::RestartReasonAttributeExtension<_AttributeExtension>,
+ org::genivi::NodeStateManager::ConsumerExtensions::ShutdownReasonAttributeExtension<_AttributeExtension>,
+ org::genivi::NodeStateManager::ConsumerExtensions::WakeUpReasonAttributeExtension<_AttributeExtension>
> class_t;
};
}
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
index 076f5cc..a226480 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
@@ -1,25 +1,12 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
- #ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
+ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
+ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
#include "Consumer.h"
@@ -39,76 +26,74 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
- namespace Consumer {
class ConsumerProxyBase: virtual public CommonAPI::Proxy {
public:
- typedef CommonAPI::ObservableAttribute<int32_t> RestartReasonAttribute;
- typedef CommonAPI::ObservableAttribute<int32_t> ShutdownReasonAttribute;
- typedef CommonAPI::ObservableAttribute<int32_t> WakeUpReasonAttribute;
- typedef CommonAPI::ObservableAttribute<int32_t> BootModeAttribute;
- typedef CommonAPI::Event<int32_t> NodeStateEvent;
+ typedef CommonAPI::ReadonlyAttribute<int32_t> BootModeAttribute;
+ typedef CommonAPI::ReadonlyAttribute<int32_t> RestartReasonAttribute;
+ typedef CommonAPI::ReadonlyAttribute<int32_t> ShutdownReasonAttribute;
+ typedef CommonAPI::ReadonlyAttribute<int32_t> WakeUpReasonAttribute;
typedef CommonAPI::Event<int32_t> NodeApplicationModeEvent;
typedef CommonAPI::Event<std::string, int32_t, int32_t> SessionStateChangedEvent;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetNodeStateAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> SetSessionStateAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetSessionStateAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetApplicationModeAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterShutdownClientAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterShutdownClientAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterSessionAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterSessionAsyncCallback;
+ typedef CommonAPI::Event<int32_t> NodeStateEvent;
typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetAppHealthCountAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetInterfaceVersionAsyncCallback;
typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestCompleteAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetInterfaceVersionAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetApplicationModeAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterSessionAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterSessionAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterShutdownClientAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterShutdownClientAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetNodeStateAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetSessionStateAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> SetSessionStateAsyncCallback;
+ virtual BootModeAttribute& getBootModeAttribute() = 0;
virtual RestartReasonAttribute& getRestartReasonAttribute() = 0;
virtual ShutdownReasonAttribute& getShutdownReasonAttribute() = 0;
virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() = 0;
- virtual BootModeAttribute& getBootModeAttribute() = 0;
- virtual NodeStateEvent& getNodeStateEvent() = 0;
virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() = 0;
virtual SessionStateChangedEvent& getSessionStateChangedEvent() = 0;
+ virtual NodeStateEvent& getNodeStateEvent() = 0;
- virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0;
+ virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0;
+ virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0;
- virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) = 0;
+ virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+ virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0;
- virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0;
+ virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0;
+ virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0;
- virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) = 0;
+ virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) = 0;
virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) = 0;
- virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0;
-
- virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0;
+ virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+ virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0;
virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) = 0;
- virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0;
+ virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+ virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0;
- virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0;
- virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0;
+ virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+ virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0;
- virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0;
- virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0;
+ virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) = 0;
+ virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0;
- virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0;
+ virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0;
+ virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0;
+
+ virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+ virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) = 0;
};
- } // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
- #endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
+ #endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
index 02fc7ae..4d4aebb 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
@@ -1,25 +1,12 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
@@ -36,7 +23,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace Consumer {
/**
* Receives messages from remote and handles all dispatching of deserialized calls
@@ -46,21 +32,8 @@ namespace Consumer {
*/
class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consumer {
public:
- ///Notifies all remote listeners about a change of value of the attribute RestartReason.
- virtual void fireRestartReasonAttributeChanged(const int32_t& RestartReason) = 0;
- ///Notifies all remote listeners about a change of value of the attribute ShutdownReason.
- virtual void fireShutdownReasonAttributeChanged(const int32_t& ShutdownReason) = 0;
- ///Notifies all remote listeners about a change of value of the attribute WakeUpReason.
- virtual void fireWakeUpReasonAttributeChanged(const int32_t& WakeUpReason) = 0;
- ///Notifies all remote listeners about a change of value of the attribute BootMode.
- virtual void fireBootModeAttributeChanged(const int32_t& BootMode) = 0;
/**
- * Sends a broadcast event for NodeState. Should not be called directly.
- * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
- */
- virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
- /**
* Sends a broadcast event for NodeApplicationMode. Should not be called directly.
* Instead, the "fire<broadcastName>Event" methods of the stub should be used.
*/
@@ -70,6 +43,11 @@ class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consume
* Instead, the "fire<broadcastName>Event" methods of the stub should be used.
*/
virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
+ /**
+ * Sends a broadcast event for NodeState. Should not be called directly.
+ * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
+ */
+ virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
};
@@ -89,6 +67,11 @@ class ConsumerStubRemoteEvent {
public:
virtual ~ConsumerStubRemoteEvent() { }
+ /// Verification callback for remote set requests on the attribute BootMode.
+ virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0;
+ /// Action callback for remote set requests on the attribute BootMode.
+ virtual void onRemoteBootModeAttributeChanged() = 0;
+
/// Verification callback for remote set requests on the attribute RestartReason.
virtual bool onRemoteSetRestartReasonAttribute(int32_t RestartReason) = 0;
/// Action callback for remote set requests on the attribute RestartReason.
@@ -104,11 +87,6 @@ class ConsumerStubRemoteEvent {
/// Action callback for remote set requests on the attribute WakeUpReason.
virtual void onRemoteWakeUpReasonAttributeChanged() = 0;
- /// Verification callback for remote set requests on the attribute BootMode.
- virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0;
- /// Action callback for remote set requests on the attribute BootMode.
- virtual void onRemoteBootModeAttributeChanged() = 0;
-
};
@@ -122,49 +100,48 @@ class ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRe
public:
virtual ~ConsumerStub() { }
+ /// Provides getter access to the attribute BootMode.
+ virtual const int32_t& getBootModeAttribute() = 0;
/// Provides getter access to the attribute RestartReason.
virtual const int32_t& getRestartReasonAttribute() = 0;
/// Provides getter access to the attribute ShutdownReason.
virtual const int32_t& getShutdownReasonAttribute() = 0;
/// Provides getter access to the attribute WakeUpReason.
virtual const int32_t& getWakeUpReasonAttribute() = 0;
- /// Provides getter access to the attribute BootMode.
- virtual const int32_t& getBootModeAttribute() = 0;
- /// This is the method that will be called on remote calls on the method GetNodeState.
- virtual void GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method SetSessionState.
- virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method GetSessionState.
- virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method GetApplicationMode.
- virtual void GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method RegisterShutdownClient.
- virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient.
- virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method RegisterSession.
- virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method UnRegisterSession.
- virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0;
/// This is the method that will be called on remote calls on the method GetAppHealthCount.
virtual void GetAppHealthCount(uint32_t& Count) = 0;
- /// This is the method that will be called on remote calls on the method GetInterfaceVersion.
- virtual void GetInterfaceVersion(uint32_t& Version) = 0;
/// This is the method that will be called on remote calls on the method LifecycleRequestComplete.
virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) = 0;
+ /// This is the method that will be called on remote calls on the method GetInterfaceVersion.
+ virtual void GetInterfaceVersion(uint32_t& Version) = 0;
+ /// This is the method that will be called on remote calls on the method GetApplicationMode.
+ virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) = 0;
+ /// This is the method that will be called on remote calls on the method UnRegisterSession.
+ virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0;
+ /// This is the method that will be called on remote calls on the method RegisterSession.
+ virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
+ /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient.
+ virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0;
+ /// This is the method that will be called on remote calls on the method RegisterShutdownClient.
+ virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0;
+ /// This is the method that will be called on remote calls on the method GetNodeState.
+ virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) = 0;
+ /// This is the method that will be called on remote calls on the method GetSessionState.
+ virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0;
+ /// This is the method that will be called on remote calls on the method SetSessionState.
+ virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) = 0;
- /// Sends a broadcast event for NodeState.
- virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
/// Sends a broadcast event for NodeApplicationMode.
virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0;
/// Sends a broadcast event for SessionStateChanged.
virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
+ /// Sends a broadcast event for NodeState.
+ virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
};
-} // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
index f923d1d..2cacb2f 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
@@ -1,29 +1,15 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#include <org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h>
+#include <org/genivi/NodeStateManager/ConsumerStubDefault.h>
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace Consumer {
ConsumerStubDefault::ConsumerStubDefault():
remoteEventHandler_(this) {
@@ -34,14 +20,45 @@ ConsumerStubRemoteEvent* ConsumerStubDefault::initStubAdapter(const std::shared_
return &remoteEventHandler_;
}
+const int32_t& ConsumerStubDefault::getBootModeAttribute() {
+ return bootModeAttributeValue_;
+}
+
+void ConsumerStubDefault::setBootModeAttribute(int32_t value) {
+ trySetBootModeAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::onRemoteBootModeAttributeChanged() {
+ // No operation in default
+}
+
+bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) {
+ if (!validateBootModeAttributeRequestedValue(value))
+ return false;
+
+ const bool valueChanged = (bootModeAttributeValue_ != value);
+ bootModeAttributeValue_ = std::move(value);
+ return valueChanged;
+}
+
+bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& value) {
+ return true;
+}
+
+bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) {
+ return defaultStub_->trySetBootModeAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() {
+ defaultStub_->onRemoteBootModeAttributeChanged();
+}
+
const int32_t& ConsumerStubDefault::getRestartReasonAttribute() {
return restartReasonAttributeValue_;
}
void ConsumerStubDefault::setRestartReasonAttribute(int32_t value) {
- const bool valueChanged = trySetRestartReasonAttribute(std::move(value));
- if (valueChanged)
- stubAdapter_->fireRestartReasonAttributeChanged(restartReasonAttributeValue_);
+ trySetRestartReasonAttribute(std::move(value));
}
void ConsumerStubDefault::onRemoteRestartReasonAttributeChanged() {
@@ -74,9 +91,7 @@ const int32_t& ConsumerStubDefault::getShutdownReasonAttribute() {
}
void ConsumerStubDefault::setShutdownReasonAttribute(int32_t value) {
- const bool valueChanged = trySetShutdownReasonAttribute(std::move(value));
- if (valueChanged)
- stubAdapter_->fireShutdownReasonAttributeChanged(shutdownReasonAttributeValue_);
+ trySetShutdownReasonAttribute(std::move(value));
}
void ConsumerStubDefault::onRemoteShutdownReasonAttributeChanged() {
@@ -109,9 +124,7 @@ const int32_t& ConsumerStubDefault::getWakeUpReasonAttribute() {
}
void ConsumerStubDefault::setWakeUpReasonAttribute(int32_t value) {
- const bool valueChanged = trySetWakeUpReasonAttribute(std::move(value));
- if (valueChanged)
- stubAdapter_->fireWakeUpReasonAttributeChanged(wakeUpReasonAttributeValue_);
+ trySetWakeUpReasonAttribute(std::move(value));
}
void ConsumerStubDefault::onRemoteWakeUpReasonAttributeChanged() {
@@ -139,59 +152,28 @@ void ConsumerStubDefault::RemoteEventHandler::onRemoteWakeUpReasonAttributeChang
defaultStub_->onRemoteWakeUpReasonAttributeChanged();
}
-const int32_t& ConsumerStubDefault::getBootModeAttribute() {
- return bootModeAttributeValue_;
-}
-void ConsumerStubDefault::setBootModeAttribute(int32_t value) {
- const bool valueChanged = trySetBootModeAttribute(std::move(value));
- if (valueChanged)
- stubAdapter_->fireBootModeAttributeChanged(bootModeAttributeValue_);
-}
-
-void ConsumerStubDefault::onRemoteBootModeAttributeChanged() {
+void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) {
// No operation in default
}
-bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) {
- if (!validateBootModeAttributeRequestedValue(value))
- return false;
-
- const bool valueChanged = (bootModeAttributeValue_ != value);
- bootModeAttributeValue_ = std::move(value);
- return valueChanged;
-}
-
-bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& value) {
- return true;
-}
-
-bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) {
- return defaultStub_->trySetBootModeAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() {
- defaultStub_->onRemoteBootModeAttributeChanged();
-}
-
-
-void ConsumerStubDefault::GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode) {
+void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) {
// No operation in default
}
-void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
+void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) {
// No operation in default
}
-void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) {
+void ConsumerStubDefault::GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) {
// No operation in default
}
-void ConsumerStubDefault::GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode) {
+void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) {
// No operation in default
}
-void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) {
+void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
// No operation in default
}
@@ -199,42 +181,37 @@ void ConsumerStubDefault::UnRegisterShutdownClient(std::string BusName, std::str
// No operation in default
}
-void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) {
+void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) {
// No operation in default
}
-void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) {
+void ConsumerStubDefault::GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) {
// No operation in default
}
-void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) {
+void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) {
// No operation in default
}
-void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) {
+void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) {
// No operation in default
}
-void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) {
- stubAdapter_->fireNodeStateEvent(NodeState);
-}
void ConsumerStubDefault::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
stubAdapter_->fireNodeApplicationModeEvent(ApplicationModeId);
}
void ConsumerStubDefault::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
stubAdapter_->fireSessionStateChangedEvent(SessionStateName, SeatID, SessionState);
}
+void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) {
+ stubAdapter_->fireNodeStateEvent(NodeState);
+}
ConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(ConsumerStubDefault* defaultStub):
defaultStub_(defaultStub) {
}
-} // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
index 76b7f8c..7cc92f9 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
@@ -1,32 +1,18 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
-#include <org/genivi/NodeStateManager/Consumer/ConsumerStub.h>
+#include <org/genivi/NodeStateManager/ConsumerStub.h>
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace Consumer {
/**
* Provides a default implementation for ConsumerStubRemoteEvent and
@@ -44,6 +30,9 @@ class ConsumerStubDefault : public ConsumerStub {
ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter);
+ virtual const int32_t& getBootModeAttribute();
+ virtual void setBootModeAttribute(int32_t value);
+
virtual const int32_t& getRestartReasonAttribute();
virtual void setRestartReasonAttribute(int32_t value);
@@ -53,38 +42,39 @@ class ConsumerStubDefault : public ConsumerStub {
virtual const int32_t& getWakeUpReasonAttribute();
virtual void setWakeUpReasonAttribute(int32_t value);
- virtual const int32_t& getBootModeAttribute();
- virtual void setBootModeAttribute(int32_t value);
+ virtual void GetAppHealthCount(uint32_t& Count);
- virtual void GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode);
+ virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode);
- virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
+ virtual void GetInterfaceVersion(uint32_t& Version);
- virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode);
+ virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId);
- virtual void GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode);
+ virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode);
- virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode);
+ virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode);
- virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
-
- virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode);
+ virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode);
- virtual void GetAppHealthCount(uint32_t& Count);
+ virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId);
- virtual void GetInterfaceVersion(uint32_t& Version);
+ virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode);
- virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode);
+ virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode);
- virtual void fireNodeStateEvent(const int32_t& NodeState);
virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
+ virtual void fireNodeStateEvent(const int32_t& NodeState);
protected:
+ virtual void onRemoteBootModeAttributeChanged();
+ virtual bool trySetBootModeAttribute(int32_t value);
+ virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
+
virtual void onRemoteRestartReasonAttributeChanged();
virtual bool trySetRestartReasonAttribute(int32_t value);
virtual bool validateRestartReasonAttributeRequestedValue(const int32_t& value);
@@ -97,16 +87,15 @@ class ConsumerStubDefault : public ConsumerStub {
virtual bool trySetWakeUpReasonAttribute(int32_t value);
virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value);
- virtual void onRemoteBootModeAttributeChanged();
- virtual bool trySetBootModeAttribute(int32_t value);
- virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
-
private:
class RemoteEventHandler: public ConsumerStubRemoteEvent {
public:
RemoteEventHandler(ConsumerStubDefault* defaultStub);
+ virtual bool onRemoteSetBootModeAttribute(int32_t value);
+ virtual void onRemoteBootModeAttributeChanged();
+
virtual bool onRemoteSetRestartReasonAttribute(int32_t value);
virtual void onRemoteRestartReasonAttributeChanged();
@@ -116,9 +105,6 @@ class ConsumerStubDefault : public ConsumerStub {
virtual bool onRemoteSetWakeUpReasonAttribute(int32_t value);
virtual void onRemoteWakeUpReasonAttributeChanged();
- virtual bool onRemoteSetBootModeAttribute(int32_t value);
- virtual void onRemoteBootModeAttributeChanged();
-
private:
ConsumerStubDefault* defaultStub_;
@@ -127,15 +113,14 @@ class ConsumerStubDefault : public ConsumerStub {
RemoteEventHandler remoteEventHandler_;
std::shared_ptr<ConsumerStubAdapter> stubAdapter_;
+ int32_t bootModeAttributeValue_;
int32_t restartReasonAttributeValue_;
int32_t shutdownReasonAttributeValue_;
int32_t wakeUpReasonAttributeValue_;
- int32_t bootModeAttributeValue_;
};
-} // namespace Consumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
new file mode 100644
index 0000000..674e11b
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
@@ -0,0 +1,55 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2013, BMW AG
+ *
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
+
+
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/types.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+class LifeCycleConsumer {
+ public:
+ virtual ~LifeCycleConsumer() { }
+
+ static inline const char* getInterfaceId();
+ static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* LifeCycleConsumer::getInterfaceId() {
+ return "org.genivi.NodeStateManager.LifeCycleConsumer";
+}
+
+CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+
+}
+
+
+namespace std {
+ //hashes for types
+
+ //hashes for error types
+}
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
deleted file mode 100644
index d4e071d..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-class LifeCycleConsumer {
- public:
- virtual ~LifeCycleConsumer() { }
-
- static inline const char* getInterfaceId();
- static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* LifeCycleConsumer::getInterfaceId() {
- return "org.genivi.NodeStateManager.LifeCycleConsumer.LifeCycleConsumer";
-}
-
-CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
- return CommonAPI::Version(0, 1);
-}
-
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
- //hashes for types
-
- //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
index 5df88da..40f18e6 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
@@ -1,29 +1,15 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
#include "LifeCycleConsumerDBusProxy.h"
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
std::shared_ptr<CommonAPI::DBus::DBusProxy> createLifeCycleConsumerDBusProxy(
const std::string& commonApiAddress,
@@ -72,11 +58,10 @@ std::future<CommonAPI::CallStatus> LifeCycleConsumerDBusProxy::LifecycleRequestA
}
void LifeCycleConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
- ownVersionMajor = 0;
- ownVersionMinor = 1;
+ ownVersionMajor = 1;
+ ownVersionMinor = 0;
}
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
index 7c4522d..351558d 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
@@ -1,27 +1,14 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h>
#define COMMONAPI_INTERNAL_COMPILATION
@@ -35,7 +22,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
public:
@@ -60,9 +46,8 @@ class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, vir
};
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
index e408a47..f59fb96 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
@@ -1,30 +1,16 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
#include "LifeCycleConsumerDBusStubAdapter.h"
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumer.h>
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLifeCycleConsumerDBusStubAdapter(
const std::string& commonApiAddress,
@@ -71,12 +57,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
template<>
-const org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
- { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::LifeCycleConsumer::lifecycleRequestStubDispatcher }
+const org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
+ { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
index 74e41a4..e6073ea 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
@@ -1,27 +1,14 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
#define COMMONAPI_INTERNAL_COMPILATION
@@ -33,7 +20,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
@@ -53,9 +39,8 @@ class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, pub
virtual const char* getMethodsDBusIntrospectionXmlData() const;
};
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
index f8e21ed..9289e83 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
@@ -1,25 +1,12 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
#include "LifeCycleConsumerProxyBase.h"
@@ -31,7 +18,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
template <typename ... _AttributeExtensions>
class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
@@ -156,11 +142,10 @@ CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtension
return delegate_->getInterfaceVersionAttribute();
}
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
index 3e780d0..7ee8471 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
@@ -1,25 +1,12 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
- #ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
#include "LifeCycleConsumer.h"
@@ -37,7 +24,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
- namespace LifeCycleConsumer {
class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy {
public:
@@ -50,9 +36,8 @@
virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0;
};
- } // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
- #endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
index f4d9d80..b7d83fd 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
@@ -1,25 +1,12 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
@@ -36,7 +23,6 @@
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
/**
* Receives messages from remote and handles all dispatching of deserialized calls
@@ -85,9 +71,8 @@ class LifeCycleConsumerStub : public CommonAPI::Stub<LifeCycleConsumerStubAdapte
};
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
index 92df0f0..cc7dbfd 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
@@ -1,29 +1,15 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h>
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
remoteEventHandler_(this) {
@@ -45,7 +31,6 @@ LifeCycleConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(LifeCycleCo
defaultStub_(defaultStub) {
}
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
index 6c5f402..22e86ab 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
@@ -1,32 +1,18 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2012, BMW AG
+ * Copyright (C) 2013, BMW AG
*
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
+ * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
+#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
namespace org {
namespace genivi {
namespace NodeStateManager {
-namespace LifeCycleConsumer {
/**
* Provides a default implementation for LifeCycleConsumerStubRemoteEvent and
@@ -66,9 +52,8 @@ class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
};
-} // namespace LifeCycleConsumer
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp
index 3761fca..6ac8f53 100644
--- a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp
+++ b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp
@@ -32,7 +32,7 @@
#include "shared/CAmDltWrapper.h"
#include "CAmNodeStateCommunicatorCAPI.h"
#include "CAmControlSender.h"
-#include "LifeCycleConsumer.h"
+#include <org/genivi/NodeStateManager/LifeCycleConsumerProxy.h>
@@ -122,7 +122,13 @@ am_Error_e CAmNodeStateCommunicatorCAPI::nsmGetRestartReasonProperty(NsmRestartR
//Check the service via the proxy object is available
IF_NOT_AVAILABLE_RETURN(E_NOT_POSSIBLE)
//Get the attribute
- return getAttributeValue(&mNSMProxy->getRestartReasonAttribute(), restartReason);
+ int32_t value;
+ CommonAPI::CallStatus status;
+ mNSMProxy->getRestartReasonAttribute().getValue(status,value);
+ if (status!=CommonAPI::CallStatus::SUCCESS)
+ return (E_UNKNOWN);
+ restartReason=static_cast<NsmRestartReason_e>(value);
+ return (E_OK);
}
/** retrieves the actual shutdown reason
@@ -135,7 +141,13 @@ am_Error_e CAmNodeStateCommunicatorCAPI::nsmGetShutdownReasonProperty(NsmShutdow
//Check the service via the proxy object is available
IF_NOT_AVAILABLE_RETURN(E_NOT_POSSIBLE)
//Get the attribute
- return getAttributeValue(&mNSMProxy->getShutdownReasonAttribute(), ShutdownReason);
+ int32_t value;
+ CommonAPI::CallStatus status;
+ mNSMProxy->getShutdownReasonAttribute().getValue(status,value);
+ if (status!=CommonAPI::CallStatus::SUCCESS)
+ return (E_UNKNOWN);
+ ShutdownReason=static_cast<NsmShutdownReason_e>(value);
+ return (E_OK);
}
/** retrieves the actual running reason
@@ -148,7 +160,13 @@ am_Error_e CAmNodeStateCommunicatorCAPI::nsmGetRunningReasonProperty(NsmRunningR
//Check the service via the proxy object is available
IF_NOT_AVAILABLE_RETURN(E_NOT_POSSIBLE)
//Get the attribute
- return getAttributeValue(&mNSMProxy->getWakeUpReasonAttribute(), nsmRunningReason);
+ int32_t value;
+ CommonAPI::CallStatus status;
+ mNSMProxy->getWakeUpReasonAttribute().getValue(status,value);
+ if (status!=CommonAPI::CallStatus::SUCCESS)
+ return (E_UNKNOWN);
+ nsmRunningReason=static_cast<NsmRunningReason_e>(value);
+ return (E_OK);
}
/** gets the node state
@@ -186,7 +204,7 @@ NsmErrorStatus_e CAmNodeStateCommunicatorCAPI::nsmGetSessionState(const std::str
CallStatus callStatus;
int32_t tmpSessionState = 0 , errorCode = 0;
- mNSMProxy->GetSessionState(sessionName, seatID, callStatus, tmpSessionState, errorCode);
+ mNSMProxy->GetSessionState(sessionName,seatID,callStatus, tmpSessionState, errorCode);
if( CallStatus::SUCCESS == callStatus)
{