summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2014-06-11 16:14:58 (GMT)
committerChristian Linke <christian.linke@bmw.de>2014-06-23 12:05:37 (GMT)
commit20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch)
tree5409ce980ecf4285a21cf0f1b38ba19dafe3129a
parentb0bc6ede2d23dde9a177483aa9470871422fe9aa (diff)
downloadaudiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
-rw-r--r--AudioManagerDaemon/CMakeLists.txt1
-rw-r--r--AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox4
-rw-r--r--AudioManagerDaemon/docx/06_classification.dox4
-rw-r--r--AudioManagerDaemon/docx/14_misc.dox2
-rw-r--r--AudioManagerDaemon/fidls/AudioManagerTypes.fidl2336
-rw-r--r--AudioManagerDaemon/include/CAmControlReceiver.h14
-rw-r--r--AudioManagerDaemon/include/CAmControlSender.h8
-rw-r--r--AudioManagerDaemon/include/CAmDatabaseHandlerMap.h14
-rw-r--r--AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h14
-rw-r--r--AudioManagerDaemon/include/CAmRouter.h4
-rw-r--r--AudioManagerDaemon/include/CAmRoutingReceiver.h6
-rw-r--r--AudioManagerDaemon/include/CAmRoutingSender.h8
-rw-r--r--AudioManagerDaemon/include/IAmDatabaseHandler.h14
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h28
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp47
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h37
-rwxr-xr-xAudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp299
-rwxr-xr-xAudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h98
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h37
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h26
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h41
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp34
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h41
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h28
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp27
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h29
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp99
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h67
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h37
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h26
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h41
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp34
-rw-r--r--AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h41
-rw-r--r--AudioManagerDaemon/src/CAmControlReceiver.cpp14
-rw-r--r--AudioManagerDaemon/src/CAmControlSender.cpp8
-rw-r--r--AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp32
-rw-r--r--AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp135
-rw-r--r--AudioManagerDaemon/src/CAmRouter.cpp26
-rw-r--r--AudioManagerDaemon/src/CAmRoutingReceiver.cpp6
-rw-r--r--AudioManagerDaemon/src/CAmRoutingSender.cpp8
-rw-r--r--AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp15
-rw-r--r--AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp12
-rw-r--r--AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp12
-rw-r--r--AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp24
-rw-r--r--AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp12
-rw-r--r--AudioManagerDaemon/test/CAmCommonFunctions.cpp10
-rw-r--r--AudioManagerDaemon/test/CAmCommonFunctions.h4
-rw-r--r--AudioManagerDaemon/test/MockIAmControlSend.h8
-rw-r--r--AudioManagerDaemon/test/MockIAmRoutingSend.h8
-rw-r--r--PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h10
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp43
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h94
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h26
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp55
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h27
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp143
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h65
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h35
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h23
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h38
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp32
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h39
-rw-r--r--PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp14
-rw-r--r--PluginCommandInterfaceCAPI/src/CAmCommandSenderCommon.cpp39
-rw-r--r--PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp16
-rw-r--r--PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp90
-rw-r--r--PluginCommandInterfaceDbus/include/CommandInterface.xml8
-rw-r--r--PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp10
-rw-r--r--PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp6
-rw-r--r--PluginControlInterface/include/CAmControlSenderBase.h8
-rw-r--r--PluginControlInterface/include/IAmControlReceiverShadow.h8
-rw-r--r--PluginControlInterface/src/CAmControlSenderBase.cpp10
-rw-r--r--PluginControlInterface/src/IAmControlReceiverShadow.cpp16
-rw-r--r--PluginControlInterface/test/CAmControlReceiverShadowTest.cpp2
-rw-r--r--PluginControlInterface/test/MockIAmControlReceive.h14
-rw-r--r--PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h22
-rw-r--r--PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp22
-rw-r--r--PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp225
-rw-r--r--PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h4
-rw-r--r--PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h6
-rw-r--r--PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl86
-rw-r--r--PluginRoutingInterfaceCAPI/include/CAmLookupData.h16
-rw-r--r--PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h8
-rw-r--r--PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h2
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp43
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h81
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h28
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp91
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h45
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp111
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h65
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h26
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp109
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h27
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp99
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h65
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h35
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h23
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h38
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp32
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h39
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h71
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h41
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h48
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp50
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h57
-rw-r--r--PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp8
-rw-r--r--PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp26
-rw-r--r--PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp8
-rw-r--r--PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp146
-rw-r--r--PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp8
-rw-r--r--PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h8
-rw-r--r--PluginRoutingInterfaceCAPI/test/MockIAmRoutingReceive.h6
-rw-r--r--PluginRoutingInterfaceCAPI/test/cmake/CAmRoutingSenderService.h.in8
-rw-r--r--PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h2
-rw-r--r--PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h8
-rw-r--r--PluginRoutingInterfaceDbus/include/RoutingReceiver.xml6
-rw-r--r--PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp54
-rw-r--r--PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp8
-rw-r--r--PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp8
-rwxr-xr-xREADME119
-rwxr-xr-xinclude/audiomanagertypes.h2581
-rw-r--r--include/command/IAmCommandReceive.h290
-rw-r--r--include/command/IAmCommandSend.h280
-rw-r--r--include/control/IAmControlReceive.h929
-rw-r--r--include/control/IAmControlSend.h590
-rw-r--r--include/projecttypes.h219
-rw-r--r--include/routing/IAmRoutingReceive.h482
-rw-r--r--include/routing/IAmRoutingSend.h253
-rw-r--r--include/shared/CAmCommonAPIWrapper.h1
131 files changed, 5261 insertions, 7177 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 2ee16f5..3714df5 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -63,6 +63,7 @@ SET(AUDIOMAN_SRCS_CXX
src/CAmLog.cpp
)
+
# Preallocation variable for the map.
IF(NOT WITH_DATABASE_STORAGE )
diff --git a/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox b/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox
index 113cf6b..fd0f1e3 100644
--- a/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox
+++ b/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox
@@ -30,7 +30,7 @@ sources and sinks since the routing adaptor will take care of handling some of t
Here are some informations that is believed to be actually communicated to the sources and sinks:
\section conFormats Connection Formats
- The am::am_ConnectionFormat_e formats for a connection are chosen when the connection is build up. So if there are more than one possbilities
+ The am::am_CustomAvailabilityReason_t formats for a connection are chosen when the connection is build up. So if there are more than one possbilities
that can be used for a connection (am::am_Sink_s::listConnectionFormats and am::am_Source_s::listConnectionFormats) the correct one is chosen
upon a connect. If this is relevant to the sources and sinks, the routingAdaptor must communicate to the sources and sinks accordingly.
\image html SettingConnectionFormats.png
@@ -43,7 +43,7 @@ Here are some informations that is believed to be actually communicated to the s
\section avail Availability
This diagram shows the sequence that is used to communicate the availability am::am_Availability_s. from the sources. Please note that the availability reasons
- am::am_AvailabilityReason_e are product specific.
+ am::am_CustomAvailabilityReason_t are product specific.
\image html AvailabilityofSources.png
Here is the same for the sinks:
\image html AvailabilityofSinks.png
diff --git a/AudioManagerDaemon/docx/06_classification.dox b/AudioManagerDaemon/docx/06_classification.dox
index ccedffc..0fb72cd 100644
--- a/AudioManagerDaemon/docx/06_classification.dox
+++ b/AudioManagerDaemon/docx/06_classification.dox
@@ -23,8 +23,8 @@
but the parameters of the Classes itself are product specific and have to be interpreted by the AudioManagerController. This concept allows for very individual
implementations of system behaviors.\n
Since Classes are held in the database, Classes can be registered and deregistered during runtime, it is recommended that the AudioManagerController enters
- all source & sink classes at start-up into the database.A ClassProperty exists out of an enumeration (am_ClassProperty_e, project specific) and a corresponding
- value (integer) that is interpreted by the AudioManagerController according to am_ClassProperty_e.\n
+ all source & sink classes at start-up into the database.A ClassProperty exists out of an enumeration (am_CustomClassProperty_t, project specific) and a corresponding
+ value (integer) that is interpreted by the AudioManagerController according to am_CustomClassProperty_t.\n
There is no restriction to the number of properties a class can have and how many classes can exist in a system.\n
\section attributes Attributes
- am::am_SourceClass_s describes the attributes of a source class\n
diff --git a/AudioManagerDaemon/docx/14_misc.dox b/AudioManagerDaemon/docx/14_misc.dox
index 7b3f950..8ae15c2 100644
--- a/AudioManagerDaemon/docx/14_misc.dox
+++ b/AudioManagerDaemon/docx/14_misc.dox
@@ -22,7 +22,7 @@ Every flow of audio is using a format to exchange data. The format that the sour
experience. It is common that sources and sinks are capable of supporting more than one audioformat.\n
So all sources and sinks register with a list of connectionFormats that they support and for each connection a format must be chosen that is then used
to transport the audio data. Gateways (and Soundconverters) have the information which connectionFormat can be transformed into another one.
-am::am_ConnectionFormat_e has all formats listed.\n
+am::am_CustomAvailabilityReason_t has all formats listed.\n
There is a special usecase that is worth showing as an example in this regard: the change of a connectionFormat when switching from one song to another. Here is an
example of how the project specific parts could handle this:
\image html ChangeofAudioformatduringplaytime.png
diff --git a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
index 0850d33..604b523 100644
--- a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
+++ b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
@@ -1,1234 +1,1234 @@
package org.genivi
<**
- @author : Christian Linke
+ @author : Christian Linke
**>
typeCollection am {
- version {
- major 1
- minor 0
- }
- array am_MainConnection_L of am_MainConnectionType_s
+ version {
+ major 1
+ minor 0
+ }
+ array am_MainConnection_L of am_MainConnectionType_s
- array am_SinkClass_L of am_SinkClass_s
+ array am_SinkClass_L of am_SinkClass_s
- array am_SinkType_L of am_SinkType_s
+ array am_SinkType_L of am_SinkType_s
- array am_SourceClass_L of am_SourceClass_s
+ array am_SourceClass_L of am_SourceClass_s
- array am_SourceType_L of am_SourceType_s
+ array am_SourceType_L of am_SourceType_s
- array am_SystemProperty_L of am_SystemProperty_s
+ array am_SystemProperty_L of am_SystemProperty_s
- array am_ClassProperty_L of am_ClassProperty_s
+ array am_ClassProperty_L of am_ClassProperty_s
- array am_ConnectionID_L of am_connectionID_t
+ array am_ConnectionID_L of am_connectionID_t
- array am_EarlyData_L of am_EarlyData_s
+ array am_EarlyData_L of am_EarlyData_s
- array am_MainSoundProperty_L of am_MainSoundProperty_s
+ array am_MainSoundProperty_L of am_MainSoundProperty_s
- array am_NotificationConfiguration_L of am_NotificationConfiguration_s
+ array am_NotificationConfiguration_L of am_NotificationConfiguration_s
- array am_RoutingElement_L of am_RoutingElement_s
+ array am_RoutingElement_L of am_RoutingElement_s
- array am_SoundProperty_L of am_SoundProperty_s
+ array am_SoundProperty_L of am_SoundProperty_s
- array am_Volumes_L of am_Volumes_s
+ array am_Volumes_L of am_Volumes_s
- array am_ConnectionFormat_L of am_ConnectionFormat_pe
+ array am_ConnectionFormat_L of am_CustomConnectionFormat_t
- array am_Convertion_L of am_bool_t
+ 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 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 domain ID
+ **>
+ typedef am_domainID_t is UInt16
- <**
- @description : a gateway ID
- **>
- typedef am_gatewayID_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 connection ID
+ **>
+ typedef am_connectionID_t is UInt16
- <**
- @description : a crossfader ID
- **>
- typedef am_crossfaderID_t is UInt16
+ <**
+ @description : a crossfader ID
+ **>
+ typedef am_crossfaderID_t is UInt16
- <**
- @description : a mainConnection ID
- **>
- typedef am_mainConnectionID_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.
+ <**
+ @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.
+ **>
+ 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_CustomConnectionFormat_t is UInt16
+
+ <**
+ @description : This project specific value gives the information about reason for reason for Source/Sink change
+ **>
+ typedef am_CustomAvailabilityReason_t is UInt16
+
+ <**
+ @description : product specific identifier of property
+ **>
+ typedef am_CustomClassProperty_t 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:
+ **>
+ typedef am_CustomRampType_t is UInt16
+
+ <**
+ @description : Project specific sound properties.
+ **>
+ typedef am_CustomSoundPropertyType_t is UInt16
+
+ <**
+ @description : Here are all SoundProperties that can be set via the CommandInterface. Product specific
+ **>
+ typedef am_CustomMainSoundPropertyType_t is UInt16
+
+ <**
+ @description : describes the different system properties. Project specific
+ **>
+ typedef am_CustomSystemPropertyType_t is UInt16
+
+ <**
+ @description : gives the type of the Notification.
+ **>
+ typedef am_CustomNotificationType_t 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_CustomAvailabilityReason_t availabilityReason
+ }
+
+ <**
+ @description : describes class properties
+ **>
+ struct am_ClassProperty_s {
+
+ <**
+ @description : the property as enum
+ **>
+ am_CustomClassProperty_t 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).
+ **>
+ 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:
+ **>
+ 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_CustomConnectionFormat_t connectionFormat
+ }
+
+ <**
+ @description : struct describing the sound property
+ **>
+ struct am_SoundProperty_s {
+
+ <**
+ @description : the type of the property - a project specific enum
+ **>
+ am_CustomSoundPropertyType_t 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_CustomSystemPropertyType_t 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.
+ **>
+ 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_CustomMainSoundPropertyType_t 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_CustomNotificationType_t 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_CustomNotificationType_t 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:
+ **>
+ 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:
+ **>
+ 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
+ **>
+ 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 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 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:
+ <**
+ @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
+ **>
+ 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
+ <**
+ @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:
+ **>
+ 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_CustomConnectionFormat_t 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_CustomRampType_t 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:
+ **>
+ 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
- }
+ **>
+ union am_DataType_u {
+ am_sinkID_t sink
+ am_sourceID_t source
+ }
} \ No newline at end of file
diff --git a/AudioManagerDaemon/include/CAmControlReceiver.h b/AudioManagerDaemon/include/CAmControlReceiver.h
index 56c4be8..9487d17 100644
--- a/AudioManagerDaemon/include/CAmControlReceiver.h
+++ b/AudioManagerDaemon/include/CAmControlReceiver.h
@@ -44,13 +44,13 @@ public:
CAmControlReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmCommandSender *iCommandSender, CAmSocketHandler *iSocketHandler, CAmRouter* iRouter);
~CAmControlReceiver();
am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList);
- am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID);
+ am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_CustomConnectionFormat_t format, const am_sourceID_t sourceID, const am_sinkID_t sinkID);
am_Error_e disconnect(am_Handle_s& handle, const am_connectionID_t connectionID);
- am_Error_e crossfade(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime);
+ am_Error_e crossfade(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_CustomRampType_t rampType, const am_time_t rampTime);
am_Error_e abortAction(const am_Handle_s handle);
am_Error_e setSourceState(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state);
- am_Error_e setSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
- am_Error_e setSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time);
+ am_Error_e setSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
+ am_Error_e setSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t rampType, const am_time_t time);
am_Error_e setSinkSoundProperties(am_Handle_s& handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& soundProperty);
am_Error_e setSinkSoundProperty(am_Handle_s& handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty);
am_Error_e setSourceSoundProperties(am_Handle_s& handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& soundProperty);
@@ -115,9 +115,9 @@ public:
void confirmControllerRundown(const am_Error_e error);
am_Error_e getSocketHandler(CAmSocketHandler*& socketHandler);
void getInterfaceVersion(std::string& version) const;
- am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
+ am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
am_Error_e setVolumes(am_Handle_s& handle, const std::vector<am_Volumes_s>& listVolumes) ;
am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) ;
am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) ;
diff --git a/AudioManagerDaemon/include/CAmControlSender.h b/AudioManagerDaemon/include/CAmControlSender.h
index c6eab50..58bae0b 100644
--- a/AudioManagerDaemon/include/CAmControlSender.h
+++ b/AudioManagerDaemon/include/CAmControlSender.h
@@ -83,15 +83,15 @@ public:
void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error) ;
void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) ;
void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) ;
- am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats) ;
+ am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t>& listPrioConnectionFormats) ;
void confirmCommandReady(const am_Error_e error) ;
void confirmRoutingReady(const am_Error_e error) ;
void confirmCommandRundown(const am_Error_e error) ;
void confirmRoutingRundown(const am_Error_e error) ;
void getInterfaceVersion(std::string& version) const ;
- am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix) ;
+ am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix) ;
void cbAckSetVolume(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error) ;
void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
diff --git a/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h b/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
index 0d590a8..218f928 100644
--- a/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
+++ b/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
@@ -117,8 +117,8 @@ public:
am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const;
am_Error_e getSinkVolume(const am_sinkID_t sinkID, am_volume_t& volume) const;
am_Error_e getSourceVolume(const am_sourceID_t sourceID, am_volume_t& volume) const;
- am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
- am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
+ am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
+ am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const;
am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const;
am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listGatewaysID) const;
@@ -138,8 +138,8 @@ public:
am_Error_e getListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties) const;
am_Error_e getListMainSourceSoundProperties(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties) const;
am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const;
- am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
- am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
+ am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
+ am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
am_Error_e getListGatewayConnectionFormats(const am_gatewayID_t gatewayID, std::vector<bool> & listConnectionFormat) const;
am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const;
am_Error_e getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const;
@@ -152,13 +152,13 @@ public:
am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID);
am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID);
am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID);
- am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
- am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+ am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+ am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration);
am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration);
- am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
+ am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration);
am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration);
diff --git a/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h b/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h
index 4741121..fad2e57 100644
--- a/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h
+++ b/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h
@@ -115,8 +115,8 @@ public:
am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const;
am_Error_e getSinkVolume(const am_sinkID_t sinkID, am_volume_t& volume) const;
am_Error_e getSourceVolume(const am_sourceID_t sourceID, am_volume_t& volume) const;
- am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
- am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
+ am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
+ am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const;
am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const;
am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listGatewaysID) const;
@@ -136,8 +136,8 @@ public:
am_Error_e getListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties) const;
am_Error_e getListMainSourceSoundProperties(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties) const;
am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const;
- am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
- am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
+ am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
+ am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
am_Error_e getListGatewayConnectionFormats(const am_gatewayID_t gatewayID, std::vector<bool> & listConnectionFormat) const;
am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const;
am_Error_e getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const;
@@ -150,13 +150,13 @@ public:
am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID);
am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID);
am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID);
- am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
- am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+ am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+ am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration);
am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration);
- am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
+ am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration);
am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration);
diff --git a/AudioManagerDaemon/include/CAmRouter.h b/AudioManagerDaemon/include/CAmRouter.h
index 275f075..76cf5fc 100644
--- a/AudioManagerDaemon/include/CAmRouter.h
+++ b/AudioManagerDaemon/include/CAmRouter.h
@@ -42,8 +42,8 @@ public:
private:
am_Error_e findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator);
- void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e>& listFormats) const;
- void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector<am_ConnectionFormat_e>& listFormats) const;
+ void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t>& listFormats) const;
+ void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_CustomConnectionFormat_t sinkConnectionFormat, std::vector<am_CustomConnectionFormat_t>& listFormats) const;
IAmDatabaseHandler* mpDatabaseHandler; //!< pointer to database handler
CAmControlSender* mpControlSender; //!< pointer the controlsender - is used to retrieve information for the optimal route
};
diff --git a/AudioManagerDaemon/include/CAmRoutingReceiver.h b/AudioManagerDaemon/include/CAmRoutingReceiver.h
index b83ae2c..4eca2aa 100644
--- a/AudioManagerDaemon/include/CAmRoutingReceiver.h
+++ b/AudioManagerDaemon/include/CAmRoutingReceiver.h
@@ -81,9 +81,9 @@ public:
void getInterfaceVersion(std::string& version) const;
void confirmRoutingReady(const uint16_t handle, const am_Error_e error);
void confirmRoutingRundown(const uint16_t handle, const am_Error_e error);
- am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceFormats, const std::vector<am_ConnectionFormat_e>& listSinkFormats, const std::vector<bool>& convertionMatrix) ;
- am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkFormats, const std::vector<bool>& convertionMatrix) ;
+ am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
void ackSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listvolumes, const am_Error_e error) ;
void ackSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
void ackSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
diff --git a/AudioManagerDaemon/include/CAmRoutingSender.h b/AudioManagerDaemon/include/CAmRoutingSender.h
index ac3f9a2..ec31560 100644
--- a/AudioManagerDaemon/include/CAmRoutingSender.h
+++ b/AudioManagerDaemon/include/CAmRoutingSender.h
@@ -58,16 +58,16 @@ public:
void setRoutingReady();
void setRoutingRundown();
am_Error_e asyncAbort(const am_Handle_s& handle);
- am_Error_e asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat);
+ am_Error_e asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat);
am_Error_e asyncDisconnect(am_Handle_s& handle, const am_connectionID_t connectionID);
- am_Error_e asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
- am_Error_e asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
+ am_Error_e asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
+ am_Error_e asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
am_Error_e asyncSetSourceState(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state);
am_Error_e asyncSetSinkSoundProperty(am_Handle_s& handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty);
am_Error_e asyncSetSourceSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sourceID_t sourceID);
am_Error_e asyncSetSinkSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sinkID_t sinkID);
am_Error_e asyncSetSourceSoundProperty(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty);
- am_Error_e asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time);
+ am_Error_e asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time);
am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState);
am_Error_e getListHandles(std::vector<am_Handle_s> & listHandles) const;
am_Error_e getListPlugins(std::vector<std::string>& interfaces) const;
diff --git a/AudioManagerDaemon/include/IAmDatabaseHandler.h b/AudioManagerDaemon/include/IAmDatabaseHandler.h
index 4f20eee..8a36801 100644
--- a/AudioManagerDaemon/include/IAmDatabaseHandler.h
+++ b/AudioManagerDaemon/include/IAmDatabaseHandler.h
@@ -106,8 +106,8 @@ public:
virtual am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const = 0;
virtual am_Error_e getSinkVolume(const am_sinkID_t sinkID, am_volume_t& volume) const = 0;
virtual am_Error_e getSourceVolume(const am_sourceID_t sourceID, am_volume_t& volume) const = 0;
- virtual am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t& value) const = 0;
- virtual am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t& value) const = 0;
+ virtual am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const = 0;
+ virtual am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const = 0;
virtual am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const = 0;
virtual am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const = 0;
virtual am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listGatewaysID) const = 0;
@@ -127,8 +127,8 @@ public:
virtual am_Error_e getListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties) const = 0;
virtual am_Error_e getListMainSourceSoundProperties(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties) const = 0;
virtual am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const = 0;
- virtual am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const = 0;
- virtual am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const = 0;
+ virtual am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const = 0;
+ virtual am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const = 0;
virtual am_Error_e getListGatewayConnectionFormats(const am_gatewayID_t gatewayID, std::vector<bool> & listConnectionFormat) const = 0;
virtual am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const = 0;
virtual am_Error_e getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const = 0;
@@ -141,13 +141,13 @@ public:
virtual am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID) = 0;
virtual am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID) = 0;
virtual am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID) = 0;
- virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
- virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
+ virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
+ virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
virtual am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations) = 0;
virtual am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations) = 0;
virtual am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) = 0;
virtual am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) = 0;
- virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) = 0;
+ virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) = 0;
virtual am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration) = 0;
virtual am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration) = 0;
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
index 4c20911..916c744 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -69,7 +57,7 @@ namespace CommonAPI {
namespace std {
//hashes for types
-
+
//hashes for error types
}
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
index 44bc944..6971e07 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -52,10 +39,10 @@ ConsumerDBusProxy::ConsumerDBusProxy(
const std::string& objectPath,
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
-,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, "i", "getBootModeAttribute"),
+restartReason_(*this, "i", "getRestartReasonAttribute"),
+shutdownReason_(*this, "i", "getShutdownReasonAttribute"),
+wakeUpReason_(*this, "i", "getWakeUpReasonAttribute")
, nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
sessionStateChanged_(*this, "SessionStateChanged", "sii"),
nodeState_(*this, "NodeState", "i")
@@ -108,7 +95,7 @@ void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, cons
*this,
"LifecycleRequestComplete",
"ui",
- RequestId, Status,
+ RequestId, Status,
callStatus
, ErrorCode);
}
@@ -161,7 +148,7 @@ void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const
*this,
"UnRegisterSession",
"ssi",
- SessionName, SessionOwner, SeatID,
+ SessionName, SessionOwner, SeatID,
callStatus
, ErrorCode);
}
@@ -180,7 +167,7 @@ void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const st
*this,
"RegisterSession",
"ssii",
- SessionName, SessionOwner, SeatID, SessionState,
+ SessionName, SessionOwner, SeatID, SessionState,
callStatus
, ErrorCode);
}
@@ -199,7 +186,7 @@ void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, con
*this,
"UnRegisterShutdownClient",
"ssu",
- BusName, ObjName, ShutdownMode,
+ BusName, ObjName, ShutdownMode,
callStatus
, ErrorCode);
}
@@ -218,7 +205,7 @@ void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const
*this,
"RegisterShutdownClient",
"ssuu",
- BusName, ObjName, ShutdownMode, TimeoutMs,
+ BusName, ObjName, ShutdownMode, TimeoutMs,
callStatus
, ErrorCode);
}
@@ -254,7 +241,7 @@ void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const in
*this,
"GetSessionState",
"si",
- SessionName, SeatID,
+ SessionName, SeatID,
callStatus
, SessionState, ErrorCode);
}
@@ -273,7 +260,7 @@ void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const st
*this,
"SetSessionState",
"ssii",
- SessionName, SessionOwner, SessionState, SeatID,
+ SessionName, SessionOwner, SessionState, SeatID,
callStatus
, ErrorCode);
}
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
index a753d63..2e08248 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -88,20 +75,20 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common
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::DBusFreedesktopReadonlyAttribute<BootModeAttribute> bootMode_;
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<RestartReasonAttribute> restartReason_;
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
+ CommonAPI::DBus::DBusReadonlyAttribute<BootModeAttribute> bootMode_;
+ CommonAPI::DBus::DBusReadonlyAttribute<RestartReasonAttribute> restartReason_;
+ CommonAPI::DBus::DBusReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
+ CommonAPI::DBus::DBusReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_;
CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_;
CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
-
+
};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp
new file mode 100755
index 0000000..7c00c67
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp
@@ -0,0 +1,299 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
+*
+* 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/.
+*/
+#include "ConsumerDBusStubAdapter.h"
+#include <org/genivi/NodeStateManager/Consumer.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createConsumerDBusStubAdapter(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
+}
+
+__attribute__((constructor)) void registerConsumerDBusStubAdapter(void) {
+ CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(Consumer::getInterfaceId(),
+ &createConsumerDBusStubAdapter);
+}
+
+
+
+ConsumerDBusStubAdapterInternal::~ConsumerDBusStubAdapterInternal() {
+ deactivateManagedInstances();
+ ConsumerDBusStubAdapterHelper::deinit();
+}
+
+void ConsumerDBusStubAdapterInternal::deactivateManagedInstances() {
+}
+
+const char* ConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+ static const std::string introspectionData =
+ "<method name=\"getInterfaceVersion\">\n"
+ "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"getBootModeAttribute\">\n"
+ "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"getRestartReasonAttribute\">\n"
+ "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"getShutdownReasonAttribute\">\n"
+ "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"getWakeUpReasonAttribute\">\n"
+ "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+ "</method>\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"
+ "<signal name=\"NodeState\">\n"
+ "<arg name=\"NodeState\" type=\"i\" />\n"
+ "</signal>\n"
+ "<method name=\"GetAppHealthCount\">\n"
+ "<arg name=\"Count\" 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"
+ "<method name=\"GetInterfaceVersion\">\n"
+ "<arg name=\"Version\" type=\"u\" direction=\"out\" />\n"
+ "</method>\n"
+ "<method name=\"GetApplicationMode\">\n"
+ "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+ "<arg name=\"ApplicationModeId\" 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=\"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=\"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=\"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=\"GetNodeState\">\n"
+ "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+ "<arg name=\"NodeStateId\" 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=\"SetSessionState\">\n"
+ "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
+ "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
+ "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
+ "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
+ "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+ "</method>\n"
+
+ ;
+ return introspectionData.c_str();
+}
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ ConsumerStub,
+ CommonAPI::Version
+ > getConsumerInterfaceVersionStubDispatcher(&ConsumerStub::getInterfaceVersion, "uu");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ ConsumerStub,
+ int32_t
+ > getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute, "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ ConsumerStub,
+ int32_t
+ > getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute, "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ ConsumerStub,
+ int32_t
+ > getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute, "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ ConsumerStub,
+ int32_t
+ > getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute, "i");
+
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+ ConsumerStub,
+ std::tuple<>,
+ std::tuple<uint32_t>
+ > getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+ ConsumerStub,
+ std::tuple<uint32_t, int32_t>,
+ std::tuple<int32_t>
+ > lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+ ConsumerStub,
+ std::tuple<>,
+ std::tuple<uint32_t>
+ > getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u");
+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, int32_t>,
+ std::tuple<int32_t>
+ > unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "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, uint32_t>,
+ std::tuple<int32_t>
+ > unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i");
+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::tuple<int32_t, int32_t>
+ > getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii");
+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::string, std::string, int32_t, int32_t>,
+ std::tuple<int32_t>
+ > setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i");
+
+
+void ConsumerDBusStubAdapterInternal::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+ ::sendSignal(
+ *this,
+ "NodeApplicationMode",
+ "i",
+ ApplicationModeId
+ );
+}
+void ConsumerDBusStubAdapterInternal::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
+ );
+}
+void ConsumerDBusStubAdapterInternal::fireNodeStateEvent(const int32_t& NodeState) {
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+ ::sendSignal(
+ *this,
+ "NodeState",
+ "i",
+ NodeState
+ );
+}
+
+const ConsumerDBusStubAdapterHelper::StubDispatcherTable& ConsumerDBusStubAdapterInternal::getStubDispatcherTable() {
+ return stubDispatcherTable_;
+}
+
+
+ConsumerDBusStubAdapterInternal::ConsumerDBusStubAdapterInternal(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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):
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ ConsumerDBusStubAdapterHelper(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ std::dynamic_pointer_cast<ConsumerStub>(stub),
+ false),
+ stubDispatcherTable_({
+ { { "getBootModeAttribute", "" }, &org::genivi::NodeStateManager::getBootModeAttributeStubDispatcher },
+ { { "getRestartReasonAttribute", "" }, &org::genivi::NodeStateManager::getRestartReasonAttributeStubDispatcher },
+ { { "getShutdownReasonAttribute", "" }, &org::genivi::NodeStateManager::getShutdownReasonAttributeStubDispatcher },
+ { { "getWakeUpReasonAttribute", "" }, &org::genivi::NodeStateManager::getWakeUpReasonAttributeStubDispatcher }
+ ,
+ { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::getAppHealthCountStubDispatcher },
+ { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::lifecycleRequestCompleteStubDispatcher },
+ { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::getInterfaceVersionStubDispatcher },
+ { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::getApplicationModeStubDispatcher },
+ { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::unRegisterSessionStubDispatcher },
+ { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::registerSessionStubDispatcher },
+ { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::unRegisterShutdownClientStubDispatcher },
+ { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::registerShutdownClientStubDispatcher },
+ { { "GetNodeState", "" }, &org::genivi::NodeStateManager::getNodeStateStubDispatcher },
+ { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::getSessionStateStubDispatcher },
+ { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::setSessionStateStubDispatcher }
+ }) {
+
+ stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::getConsumerInterfaceVersionStubDispatcher });
+}
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h
new file mode 100755
index 0000000..d8335d7
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h
@@ -0,0 +1,98 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
+*
+* 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 Christian Linke
+ */
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_STUB_ADAPTER_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_STUB_ADAPTER_H_
+
+#include <org/genivi/NodeStateManager/ConsumerStub.h>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
+#include <CommonAPI/DBus/DBusStubAdapter.h>
+#include <CommonAPI/DBus/DBusFactory.h>
+#include <CommonAPI/DBus/DBusServicePublisher.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+typedef CommonAPI::DBus::DBusStubAdapterHelper<ConsumerStub> ConsumerDBusStubAdapterHelper;
+
+class ConsumerDBusStubAdapterInternal: public ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper {
+ public:
+ ConsumerDBusStubAdapterInternal(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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);
+
+ ~ConsumerDBusStubAdapterInternal();
+
+
+ void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
+ void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
+ void fireNodeStateEvent(const int32_t& NodeState);
+
+
+ const ConsumerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
+ void deactivateManagedInstances();
+
+
+ protected:
+ virtual const char* getMethodsDBusIntrospectionXmlData() const;
+
+ private:
+ ConsumerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class ConsumerDBusStubAdapter: public ConsumerDBusStubAdapterInternal, public std::enable_shared_from_this<ConsumerDBusStubAdapter> {
+public:
+ ConsumerDBusStubAdapter(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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) :
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ ConsumerDBusStubAdapterInternal(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ stub) { }
+};
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
index 1aadb11..bd473f1 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
#include "ConsumerProxyBase.h"
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -42,11 +30,15 @@ namespace genivi {
namespace NodeStateManager {
template <typename ... _AttributeExtensions>
-class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, public _AttributeExtensions... {
- public:
+class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase
+, public _AttributeExtensions... {
+public:
ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
~ConsumerProxy();
+ typedef Consumer InterfaceType;
+
+
/**
* Returns the wrapper class that provides access to the attribute BootMode.
*/
@@ -318,7 +310,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
* 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& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
-
+
/**
* Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -598,7 +590,6 @@ CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::ge
return delegate_->getInterfaceVersionAttribute();
}
-
} // namespace NodeStateManager
} // namespace genivi
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
index cd757f8..a5d9ed8 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -34,6 +21,7 @@
#define COMMONAPI_INTERNAL_COMPILATION
#endif
+#include <vector>
#include <CommonAPI/Attribute.h>
#include <CommonAPI/Event.h>
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
index 287cd56..c56949a 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -36,6 +23,7 @@
#endif
#include <unordered_set>
+#include <vector>
#include <CommonAPI/Stub.h>
@@ -69,10 +57,9 @@ class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consume
* Instead, the "fire<broadcastName>Event" methods of the stub should be used.
*/
virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
-
-
+
+
virtual void deactivateManagedInstances() = 0;
-
protected:
/**
* Defines properties for storing the ClientIds of clients / proxies that have
@@ -110,9 +97,10 @@ class ConsumerStubRemoteEvent {
* This class and the one above are the ones an application developer needs to have
* a look at if he wants to implement a service.
*/
-class ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRemoteEvent> {
- public:
+class ConsumerStub : public virtual CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent> {
+public:
virtual ~ConsumerStub() { }
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
/// Provides getter access to the attribute BootMode
virtual const int32_t& getBootModeAttribute(const std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
@@ -151,7 +139,10 @@ class ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRe
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;
-
+
+ using CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
};
} // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
index 489d57d..1e34da5 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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/.
*/
#include <org/genivi/NodeStateManager/ConsumerStubDefault.h>
@@ -27,11 +14,16 @@ namespace genivi {
namespace NodeStateManager {
ConsumerStubDefault::ConsumerStubDefault():
- remoteEventHandler_(this) {
+ remoteEventHandler_(this),
+ interfaceVersion_(Consumer::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& ConsumerStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+ return interfaceVersion_;
}
ConsumerStubRemoteEvent* ConsumerStubDefault::initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
+ CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::stubAdapter_ = stubAdapter;
return &remoteEventHandler_;
}
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
index 57de061..80dc926 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -26,6 +13,7 @@
#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
+
#include <org/genivi/NodeStateManager/ConsumerStub.h>
#include <sstream>
@@ -43,12 +31,14 @@ namespace NodeStateManager {
* that would be defined for this service, and/or if you do not need any non-default
* behaviour.
*/
-class ConsumerStubDefault : public ConsumerStub {
- public:
+class ConsumerStubDefault : public virtual ConsumerStub {
+public:
ConsumerStubDefault();
ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter);
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
virtual const int32_t& getBootModeAttribute();
virtual const int32_t& getBootModeAttribute(const std::shared_ptr<CommonAPI::ClientId> clientId);
virtual void setBootModeAttribute(int32_t value);
@@ -99,9 +89,9 @@ class ConsumerStubDefault : public ConsumerStub {
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:
+
+protected:
virtual bool trySetBootModeAttribute(int32_t value);
virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
virtual bool trySetRestartReasonAttribute(int32_t value);
@@ -110,8 +100,7 @@ class ConsumerStubDefault : public ConsumerStub {
virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value);
virtual bool trySetWakeUpReasonAttribute(int32_t value);
virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value);
- std::shared_ptr<ConsumerStubAdapter> stubAdapter_;
- private:
+private:
class RemoteEventHandler: public ConsumerStubRemoteEvent {
public:
RemoteEventHandler(ConsumerStubDefault* defaultStub);
@@ -131,6 +120,8 @@ class ConsumerStubDefault : public ConsumerStub {
int32_t restartReasonAttributeValue_;
int32_t shutdownReasonAttributeValue_;
int32_t wakeUpReasonAttributeValue_;
+
+ CommonAPI::Version interfaceVersion_;
};
} // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
index ffadf23..56cbf4c 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -69,7 +57,7 @@ namespace CommonAPI {
namespace std {
//hashes for types
-
+
//hashes for error types
}
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
index 6fe5ecb..ab06c26 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -63,7 +50,7 @@ void LifeCycleConsumerDBusProxy::LifecycleRequest(const uint32_t& Request, const
*this,
"LifecycleRequest",
"uu",
- Request, RequestId,
+ Request, RequestId,
callStatus
, ErrorCode);
}
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
index 8c1dc9b..d69d805 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -59,13 +46,13 @@ class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, vir
virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
-
+
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
private:
-
+
};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
index a59a683..96ac35b 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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/.
*/
#include "LifeCycleConsumerDBusStubAdapter.h"
#include <org/genivi/NodeStateManager/LifeCycleConsumer.h>
@@ -43,40 +30,35 @@ __attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void)
&createLifeCycleConsumerDBusStubAdapter);
}
-LifeCycleConsumerDBusStubAdapter::LifeCycleConsumerDBusStubAdapter(
- const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
- 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):
- LifeCycleConsumerDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath,
- dbusConnection, std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub),
- NULL)
- {
-}
-LifeCycleConsumerDBusStubAdapter::~LifeCycleConsumerDBusStubAdapter() {
+
+LifeCycleConsumerDBusStubAdapterInternal::~LifeCycleConsumerDBusStubAdapterInternal() {
deactivateManagedInstances();
- deinit();
- stub_.reset();
+ LifeCycleConsumerDBusStubAdapterHelper::deinit();
}
-void LifeCycleConsumerDBusStubAdapter::deactivateManagedInstances() {
+void LifeCycleConsumerDBusStubAdapterInternal::deactivateManagedInstances() {
}
-const char* LifeCycleConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
- static const char* introspectionData =
+const char* LifeCycleConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+ static const std::string introspectionData =
+ "<method name=\"getInterfaceVersion\">\n"
+ "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+ "</method>\n"
"<method name=\"LifecycleRequest\">\n"
"<arg name=\"Request\" type=\"u\" direction=\"in\" />\n"
"<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
"<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
"</method>\n"
+
;
- return introspectionData;
+ return introspectionData.c_str();
}
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ LifeCycleConsumerStub,
+ CommonAPI::Version
+ > getLifeCycleConsumerInterfaceVersionStubDispatcher(&LifeCycleConsumerStub::getInterfaceVersion, "uu");
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
@@ -87,14 +69,43 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-const LifeCycleConsumerDBusStubAdapter::StubDispatcherTable& LifeCycleConsumerDBusStubAdapter::getStubDispatcherTable() {
- static const LifeCycleConsumerDBusStubAdapter::StubDispatcherTable stubDispatcherTable = {
- { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
- };
- return stubDispatcherTable;
+const LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable& LifeCycleConsumerDBusStubAdapterInternal::getStubDispatcherTable() {
+ return stubDispatcherTable_;
}
+LifeCycleConsumerDBusStubAdapterInternal::LifeCycleConsumerDBusStubAdapterInternal(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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):
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ LifeCycleConsumerDBusStubAdapterHelper(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub),
+ false),
+ stubDispatcherTable_({
+ { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
+ }) {
+
+ stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::getLifeCycleConsumerInterfaceVersionStubDispatcher });
+}
+
} // namespace NodeStateManager
} // namespace genivi
} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
index 915d30f..c03f0c3 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -45,9 +32,9 @@ namespace NodeStateManager {
typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
-class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
+class LifeCycleConsumerDBusStubAdapterInternal: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
public:
- LifeCycleConsumerDBusStubAdapter(
+ LifeCycleConsumerDBusStubAdapterInternal(
const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
const std::string& commonApiAddress,
const std::string& dbusInterfaceName,
@@ -56,19 +43,49 @@ class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, pub
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
const std::shared_ptr<CommonAPI::StubBase>& stub);
- ~LifeCycleConsumerDBusStubAdapter();
+ ~LifeCycleConsumerDBusStubAdapterInternal();
-
- const StubDispatcherTable& getStubDispatcherTable();
-
+
+ const LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
void deactivateManagedInstances();
+
protected:
virtual const char* getMethodsDBusIntrospectionXmlData() const;
private:
+ LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerDBusStubAdapterInternal, public std::enable_shared_from_this<LifeCycleConsumerDBusStubAdapter> {
+public:
+ LifeCycleConsumerDBusStubAdapter(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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) :
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ LifeCycleConsumerDBusStubAdapterInternal(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ stub) { }
};
} // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
index a86373e..374ef1e 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
#include "LifeCycleConsumerProxyBase.h"
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -40,11 +28,15 @@ namespace genivi {
namespace NodeStateManager {
template <typename ... _AttributeExtensions>
-class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
- public:
+class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase
+, public _AttributeExtensions... {
+public:
LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
~LifeCycleConsumerProxy();
+ typedef LifeCycleConsumer InterfaceType;
+
+
/**
@@ -68,7 +60,7 @@ class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public L
* It will provide the same value for CallStatus as will be handed to the callback.
*/
virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
-
+
/**
* Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -180,7 +172,6 @@ CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtension
return delegate_->getInterfaceVersionAttribute();
}
-
} // namespace NodeStateManager
} // namespace genivi
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
index 297c465..ad8ee6a 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -34,6 +21,7 @@
#define COMMONAPI_INTERNAL_COMPILATION
#endif
+#include <vector>
#include <CommonAPI/Proxy.h>
#include <functional>
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
index 0b949d5..58f5bb0 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -35,6 +22,7 @@
#define COMMONAPI_INTERNAL_COMPILATION
#endif
+#include <vector>
#include <CommonAPI/Stub.h>
@@ -53,10 +41,9 @@ namespace NodeStateManager {
class LifeCycleConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public LifeCycleConsumer {
public:
-
-
+
+
virtual void deactivateManagedInstances() = 0;
-
protected:
/**
* Defines properties for storing the ClientIds of clients / proxies that have
@@ -90,14 +77,18 @@ class LifeCycleConsumerStubRemoteEvent {
* This class and the one above are the ones an application developer needs to have
* a look at if he wants to implement a service.
*/
-class LifeCycleConsumerStub : public CommonAPI::Stub<LifeCycleConsumerStubAdapter , LifeCycleConsumerStubRemoteEvent> {
- public:
+class LifeCycleConsumerStub : public virtual CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent> {
+public:
virtual ~LifeCycleConsumerStub() { }
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
/// This is the method that will be called on remote calls on the method LifecycleRequest.
virtual void LifecycleRequest(const std::shared_ptr<CommonAPI::ClientId> clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) = 0;
-
+
+ using CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
};
} // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
index 3883923..03801fa 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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/.
*/
#include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h>
@@ -27,11 +14,16 @@ namespace genivi {
namespace NodeStateManager {
LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
- remoteEventHandler_(this) {
+ remoteEventHandler_(this),
+ interfaceVersion_(LifeCycleConsumer::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& LifeCycleConsumerStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+ return interfaceVersion_;
}
LifeCycleConsumerStubRemoteEvent* LifeCycleConsumerStubDefault::initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
+ CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::stubAdapter_ = stubAdapter;
return &remoteEventHandler_;
}
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
index d59a8e2..fe35b9f 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
@@ -1,24 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* 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/.
+* 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 Christian Linke
@@ -26,6 +13,7 @@
#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+
#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
#include <sstream>
@@ -43,22 +31,23 @@ namespace NodeStateManager {
* that would be defined for this service, and/or if you do not need any non-default
* behaviour.
*/
-class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
- public:
+class LifeCycleConsumerStubDefault : public virtual LifeCycleConsumerStub {
+public:
LifeCycleConsumerStubDefault();
LifeCycleConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter);
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
virtual void LifecycleRequest(const std::shared_ptr<CommonAPI::ClientId> clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
-
- protected:
- std::shared_ptr<LifeCycleConsumerStubAdapter> stubAdapter_;
- private:
+
+protected:
+private:
class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent {
public:
RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub);
@@ -70,6 +59,8 @@ class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
RemoteEventHandler remoteEventHandler_;
+
+ CommonAPI::Version interfaceVersion_;
};
} // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 54346f1..ae017e2 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -78,7 +78,7 @@ am_Error_e CAmControlReceiver::getRoute(const bool onlyfree, const am_sourceID_t
return (mRouter->getRoute(onlyfree, sourceID, sinkID, returnList));
}
-am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t & connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)
+am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t & connectionID, const am_CustomConnectionFormat_t format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)
{
logInfo("CAmControlReceiver::connect got called, connectionFormat=", format, "sourceID=", sourceID, "sinkID=", sinkID);
@@ -99,7 +99,7 @@ am_Error_e CAmControlReceiver::disconnect(am_Handle_s & handle, const am_connect
return (mRoutingSender->asyncDisconnect(handle, connectionID));
}
-am_Error_e CAmControlReceiver::crossfade(am_Handle_s & handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime)
+am_Error_e CAmControlReceiver::crossfade(am_Handle_s & handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_CustomRampType_t rampType, const am_time_t rampTime)
{
logInfo("CAmControlReceiver::crossfade got called, hotSource=", hotSource, "crossfaderID=", crossfaderID, "rampType=", rampType, "rampTime=", rampTime);
return (mRoutingSender->asyncCrossFade(handle, crossfaderID, hotSource, rampType, rampTime));
@@ -111,13 +111,13 @@ am_Error_e CAmControlReceiver::setSourceState(am_Handle_s & handle, const am_sou
return (mRoutingSender->asyncSetSourceState(handle, sourceID, state));
}
-am_Error_e CAmControlReceiver::setSinkVolume(am_Handle_s & handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmControlReceiver::setSinkVolume(am_Handle_s & handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
logInfo("CAmControlReceiver::setSinkVolume got called, sinkID=", sinkID, "volume=", volume, "ramp=", ramp, "time=", time);
return (mRoutingSender->asyncSetSinkVolume(handle, sinkID, volume, ramp, time));
}
-am_Error_e CAmControlReceiver::setSourceVolume(am_Handle_s & handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmControlReceiver::setSourceVolume(am_Handle_s & handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t rampType, const am_time_t time)
{
logInfo("CAmControlReceiver::setSourceVolume got called, sourceID=", sourceID, "volume=", volume, "ramp=", rampType, "time=", time);
return (mRoutingSender->asyncSetSourceVolume(handle, sourceID, volume, rampType, time));
@@ -471,19 +471,19 @@ void CAmControlReceiver::getInterfaceVersion(std::string & version) const
version = ControlReceiveVersion;
}
-am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
logInfo("CAmControlReceiver::changeSourceDB was called, sourceID", sourceID);
return (mDatabaseHandler->changeSourceDB(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
}
-am_Error_e CAmControlReceiver::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlReceiver::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
logInfo("CAmControlReceiver::changeSinkDB was called with sinkID", sinkID);
return (mDatabaseHandler->changeSinkDB(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
}
-am_Error_e CAmControlReceiver::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmControlReceiver::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
{
logInfo("CAmControlReceiver::changeGatewayDB was called with gatewayID", gatewayID);
return (mDatabaseHandler->changeGatewayDB(gatewayID,listSourceConnectionFormats,listSinkConnectionFormats,convertionMatrix));
diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp
index dbbc539..229a28b 100644
--- a/AudioManagerDaemon/src/CAmControlSender.cpp
+++ b/AudioManagerDaemon/src/CAmControlSender.cpp
@@ -349,7 +349,7 @@ void CAmControlSender::setControllerRundown(const int16_t signal)
mController->setControllerRundown(signal);
}
-am_Error_e am::CAmControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats)
+am_Error_e am::CAmControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t> & listPrioConnectionFormats)
{
assert(mController);
return (mController->getConnectionFormatChoice(sourceID, sinkID, listRoute, listPossibleConnectionFormats, listPrioConnectionFormats));
@@ -396,19 +396,19 @@ void CAmControlSender::hookSystemNodeApplicationModeChanged(const NsmApplication
mController->hookSystemNodeApplicationModeChanged(ApplicationModeId);
}
-am_Error_e CAmControlSender::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlSender::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
assert(mController);
return (mController->hookSystemUpdateSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
}
-am_Error_e CAmControlSender::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlSender::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
assert(mController);
return (mController->hookSystemUpdateSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
}
-am_Error_e CAmControlSender::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmControlSender::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix)
{
assert(mController);
return (mController->hookSystemUpdateGateway(gatewayID,listSourceConnectionFormats,listSinkConnectionFromats,convertionMatrix));
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
index ee2f35c..0aec9f2 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
@@ -179,7 +179,7 @@ void CAmDatabaseHandlerMap::CAmSource::getDescription (std::string & outString)
fmt << "[type:" << ref.type << " value:" << ref.value <<"]";
});
fmt << ") listConnectionFormats (";
- std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+ std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
fmt << "[" << ref << "]";
});
fmt << ") listMainSoundProperties (";
@@ -217,7 +217,7 @@ void CAmDatabaseHandlerMap::CAmSink::getDescription (std::string & outString) co
fmt << "[type:" << ref.type << " value:" << ref.value <<"]";
});
fmt << ") listConnectionFormats (";
- std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+ std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
fmt << "[" << ref << "]";
});
fmt << ") listMainSoundProperties (";
@@ -328,11 +328,11 @@ void CAmDatabaseHandlerMap::CAmGateway::getDescription (std::string & outString)
") domainSourceID(" << domainSourceID <<
") controlDomainID(" << controlDomainID <<
") listSourceFormats (";
- std::for_each(listSourceFormats.begin(), listSourceFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+ std::for_each(listSourceFormats.begin(), listSourceFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
fmt << "[" << ref << "]";
});
fmt << ") listSinkFormats (";
- std::for_each(listSinkFormats.begin(), listSinkFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+ std::for_each(listSinkFormats.begin(), listSinkFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
fmt << "[" << ref << "]";
});
fmt << ") convertionMatrix (";
@@ -1056,7 +1056,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSinkAvailabilityDB(const am_Availability
{
assert(sinkID!=0);
assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
- assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
if (!existSink(sinkID))
{
@@ -1110,7 +1109,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSinkMuteStateDB(const am_MuteState_e mut
am_Error_e CAmDatabaseHandlerMap::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID)
{
- assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
assert(sinkID!=0);
if (!existSink(sinkID))
@@ -1133,7 +1131,6 @@ am_Error_e CAmDatabaseHandlerMap::changeMainSinkSoundPropertyDB(const am_MainSou
am_Error_e CAmDatabaseHandlerMap::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID)
{
- assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
assert(sourceID!=0);
if (!existSource(sourceID))
@@ -1159,7 +1156,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceAvailabilityDB(const am_Availabili
{
assert(sourceID!=0);
assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
- assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
if (!existSource(sourceID))
{
@@ -1177,8 +1173,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceAvailabilityDB(const am_Availabili
am_Error_e CAmDatabaseHandlerMap::changeSystemPropertyDB(const am_SystemProperty_s & property)
{
- assert(property.type>=SYP_UNKNOWN && property.type<=SYP_MAX);
-
std::vector<am_SystemProperty_s>::iterator elementIterator = mMappedData.mSystemProperties.begin();
for (;elementIterator != mMappedData.mSystemProperties.end(); ++elementIterator)
{
@@ -1757,7 +1751,7 @@ am_Error_e CAmDatabaseHandlerMap::getListSystemProperties(std::vector<am_SystemP
return (E_OK);
}
-am_Error_e am::CAmDatabaseHandlerMap::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerMap::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
{
if (!existSink(sinkID))
return E_NON_EXISTENT;
@@ -1767,7 +1761,7 @@ am_Error_e am::CAmDatabaseHandlerMap::getListSinkConnectionFormats(const am_sink
return (E_OK);
}
-am_Error_e am::CAmDatabaseHandlerMap::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerMap::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
{
if (!existSource(sourceID))
return E_NON_EXISTENT;
@@ -2201,7 +2195,7 @@ am_Error_e CAmDatabaseHandlerMap::getSourceVolume(const am_sourceID_t sourceID,
return (E_NON_EXISTENT);
}
-am_Error_e CAmDatabaseHandlerMap::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerMap::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
{
assert(sinkID!=0);
@@ -2222,7 +2216,7 @@ am_Error_e CAmDatabaseHandlerMap::getSinkSoundPropertyValue(const am_sinkID_t si
return (E_NON_EXISTENT);
}
-am_Error_e CAmDatabaseHandlerMap::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerMap::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
{
assert(sourceID!=0);
@@ -2377,7 +2371,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceVolume(const am_sourceID_t sourceI
am_Error_e CAmDatabaseHandlerMap::changeSourceSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sourceID_t sourceID)
{
- assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
assert(sourceID!=0);
if (!existSource(sourceID))
@@ -2399,7 +2392,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceSoundPropertyDB(const am_SoundProp
am_Error_e CAmDatabaseHandlerMap::changeSinkSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sinkID_t sinkID)
{
- assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
assert(sinkID!=0);
if (!existSink(sinkID))
@@ -2422,7 +2414,7 @@ am_Error_e CAmDatabaseHandlerMap::changeSinkSoundPropertyDB(const am_SoundProper
am_Error_e CAmDatabaseHandlerMap::changeCrossFaderHotSink(const am_crossfaderID_t crossfaderID, const am_HotSink_e hotsink)
{
assert(crossfaderID!=0);
- assert(hotsink>=HS_UNKNOWN && hotsink>=HS_MAX);
+ assert(hotsink!=HS_UNKNOWN);
if (!existcrossFader(crossfaderID))
{
@@ -2512,7 +2504,7 @@ am_Error_e am::CAmDatabaseHandlerMap::peekSourceClassID(const std::string & name
}
-am_Error_e CAmDatabaseHandlerMap::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerMap::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
assert(sourceID!=0);
@@ -2570,7 +2562,7 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceDB(const am_sourceID_t sourceID, c
}
-am_Error_e CAmDatabaseHandlerMap::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerMap::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
assert(sinkID!=0);
@@ -2703,7 +2695,7 @@ am_Error_e CAmDatabaseHandlerMap::changeMainSourceNotificationConfigurationDB(co
return (E_OK);
}
-am_Error_e CAmDatabaseHandlerMap::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmDatabaseHandlerMap::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
{
assert(gatewayID!=0);
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp
index df0fbcb..1390fc4 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp
@@ -457,7 +457,7 @@ am_Error_e CAmDatabaseHandlerSQLite::enterSinkDB(const am_Sink_s & sinkData, am_
//fill ConnectionFormats
command = "INSERT INTO SinkConnectionFormat" + i2s(sinkID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = sinkData.listConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = sinkData.listConnectionFormats.begin();
for (; connectionFormatIterator < sinkData.listConnectionFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -722,7 +722,7 @@ am_Error_e CAmDatabaseHandlerSQLite::enterGatewayDB(const am_Gateway_s & gateway
//fill ConnectionFormats
command = "INSERT INTO GatewaySourceFormat" + i2s(gatewayID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = gatewayData.listSourceFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = gatewayData.listSourceFormats.begin();
for (; connectionFormatIterator < gatewayData.listSourceFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -874,7 +874,7 @@ am_Error_e CAmDatabaseHandlerSQLite::enterSourceDB(const am_Source_s & sourceDat
//fill ConnectionFormats
command = "INSERT INTO SourceConnectionFormat" + i2s(sourceID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = sourceData.listConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = sourceData.listConnectionFormats.begin();
for (; connectionFormatIterator != sourceData.listConnectionFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -1111,7 +1111,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSinkAvailabilityDB(const am_Availabil
{
assert(sinkID!=0);
assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
- assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
sqlite3_stmt* query = NULL;
int eCode = 0;
@@ -1203,7 +1202,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSinkMuteStateDB(const am_MuteState_e
am_Error_e CAmDatabaseHandlerSQLite::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID)
{
- assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
assert(sinkID!=0);
sqlite3_stmt* query = NULL;
@@ -1233,7 +1231,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeMainSinkSoundPropertyDB(const am_Main
am_Error_e CAmDatabaseHandlerSQLite::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID)
{
- assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
assert(sourceID!=0);
sqlite3_stmt* query = NULL;
@@ -1266,7 +1263,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceAvailabilityDB(const am_Availab
{
assert(sourceID!=0);
assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
- assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
sqlite3_stmt* query = NULL;
int eCode = 0;
@@ -1298,7 +1294,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceAvailabilityDB(const am_Availab
am_Error_e CAmDatabaseHandlerSQLite::changeSystemPropertyDB(const am_SystemProperty_s & property)
{
- assert(property.type>=SYP_UNKNOWN && property.type<=SYP_MAX);
sqlite3_stmt* query = NULL;
int eCode = 0;
std::string command = "UPDATE " + std::string(SYSTEM_TABLE) + " set value=? WHERE type=?";
@@ -1580,7 +1575,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceClassInfoDB(const am_sourceID_t so
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(query, 0);
+ propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(query, 0);
propertyTemp.value = sqlite3_column_int(query, 1);
classInfo.listClassProperties.push_back(propertyTemp);
}
@@ -1608,7 +1603,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qMAinSoundProperty = NULL, *qMainNotification = NULL, *qNotification = NULL;
int eCode = 0;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
am_SoundProperty_s tempSoundProperty;
am_MainSoundProperty_s tempMainSoundProperty;
am_NotificationConfiguration_s tempNotificationConfiguration,tempMainNotification;
@@ -1623,7 +1618,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
sinkData.volume = sqlite3_column_int(query, 3);
sinkData.visible = sqlite3_column_int(query, 4);
sinkData.available.availability = (am_Availability_e) sqlite3_column_int(query, 5);
- sinkData.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 6);
+ sinkData.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 6);
sinkData.muteState = (am_MuteState_e) sqlite3_column_int(query, 7);
sinkData.mainVolume = sqlite3_column_int(query, 8);
sinkData.sinkID = sqlite3_column_int(query, 9);
@@ -1633,7 +1628,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
sinkData.listConnectionFormats.push_back(tempConnectionFormat);
}
@@ -1644,7 +1639,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL)
while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
{
- tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+ tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
sinkData.listSoundProperties.push_back(tempSoundProperty);
}
@@ -1656,7 +1651,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW)
{
- tempNotificationConfiguration.type = static_cast<am_NotificationType_e>(sqlite3_column_int(qNotification, 0));
+ tempNotificationConfiguration.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qNotification, 0));
tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qNotification, 1));
tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qNotification, 2));
sinkData.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -1671,7 +1666,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
{
- tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+ tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
sinkData.listMainSoundProperties.push_back(tempMainSoundProperty);
}
@@ -1683,7 +1678,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW)
{
- tempMainNotification.type = static_cast<am_NotificationType_e>(sqlite3_column_int(qMainNotification, 0));
+ tempMainNotification.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qMainNotification, 0));
tempMainNotification.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qMainNotification, 1));
tempMainNotification.parameter= static_cast<int16_t>(sqlite3_column_int(qMainNotification, 2));
sinkData.listMainNotificationConfigurations.push_back(tempMainNotification);
@@ -1715,7 +1710,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qMAinSoundProperty = NULL, *qMainNotification = NULL, *qNotification = NULL;
int eCode = 0;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
am_SoundProperty_s tempSoundProperty;
am_MainSoundProperty_s tempMainSoundProperty;
am_NotificationConfiguration_s tempNotificationConfiguration,tempMainNotification;
@@ -1731,7 +1726,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
sourceData.volume = sqlite3_column_int(query, 4);
sourceData.visible = sqlite3_column_int(query, 5);
sourceData.available.availability = (am_Availability_e) sqlite3_column_int(query, 6);
- sourceData.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 7);
+ sourceData.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 7);
sourceData.interruptState = (am_InterruptState_e) sqlite3_column_int(query, 8);
sourceData.sourceID = sqlite3_column_int(query, 9);
@@ -1740,7 +1735,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
sourceData.listConnectionFormats.push_back(tempConnectionFormat);
}
@@ -1751,7 +1746,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL);
while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
{
- tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+ tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
sourceData.listSoundProperties.push_back(tempSoundProperty);
}
@@ -1763,7 +1758,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW)
{
- tempNotificationConfiguration.type = static_cast<am_NotificationType_e>(sqlite3_column_int(qNotification, 0));
+ tempNotificationConfiguration.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qNotification, 0));
tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qNotification, 1));
tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qNotification, 2));
sourceData.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -1778,7 +1773,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
{
- tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+ tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
sourceData.listMainSoundProperties.push_back(tempMainSoundProperty);
}
@@ -1790,7 +1785,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW)
{
- tempMainNotification.type = static_cast<am_NotificationType_e>(sqlite3_column_int(qMainNotification, 0));
+ tempMainNotification.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qMainNotification, 0));
tempMainNotification.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qMainNotification, 1));
tempMainNotification.parameter= static_cast<int16_t>(sqlite3_column_int(qMainNotification, 2));
sourceData.listMainNotificationConfigurations.push_back(tempMainNotification);
@@ -1979,7 +1974,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkClassInfoDB(const am_sinkID_t sinkID
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(query, 0);
+ propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(query, 0);
propertyTemp.value = sqlite3_column_int(query, 1);
sinkClass.listClassProperties.push_back(propertyTemp);
}
@@ -2004,7 +1999,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getGatewayInfoDB(const am_gatewayID_t gatew
}
sqlite3_stmt* query = NULL, *qSinkConnectionFormat = NULL, *qSourceConnectionFormat = NULL;
int eCode = 0;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
std::string command = "SELECT name, sinkID, sourceID, domainSinkID, domainSourceID, controlDomainID, gatewayID FROM " + std::string(GATEWAY_TABLE) + " WHERE gatewayID=" + i2s(gatewayID);
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
@@ -2034,7 +2029,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getGatewayInfoDB(const am_gatewayID_t gatew
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSourceConnectionFormat, NULL)
while ((eCode = sqlite3_step(qSourceConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSourceConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSourceConnectionFormat, 0);
gatewayData.listSourceFormats.push_back(tempConnectionFormat);
}
@@ -2045,7 +2040,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getGatewayInfoDB(const am_gatewayID_t gatew
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSinkConnectionFormat, NULL)
while ((eCode = sqlite3_step(qSinkConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSinkConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSinkConnectionFormat, 0);
gatewayData.listSinkFormats.push_back(tempConnectionFormat);
}
@@ -2318,7 +2313,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListConnections(std::vector<am_Connectio
temp.sourceID = sqlite3_column_int(query, 1);
temp.sinkID = sqlite3_column_int(query, 2);
temp.delay = sqlite3_column_int(query, 3);
- temp.connectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(query, 4);
+ temp.connectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(query, 4);
listConnections.push_back(temp);
}
@@ -2340,7 +2335,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qNotificationConfiguration= NULL, *qMAinSoundProperty = NULL, *qMainNotificationConfiguration= NULL;
int eCode = 0;
am_Sink_s temp;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
am_SoundProperty_s tempSoundProperty;
am_MainSoundProperty_s tempMainSoundProperty;
am_NotificationConfiguration_s tempNotificationConfiguration;
@@ -2356,7 +2351,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
temp.volume = sqlite3_column_int(query, 3);
temp.visible = sqlite3_column_int(query, 4);
temp.available.availability = (am_Availability_e) sqlite3_column_int(query, 5);
- temp.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 6);
+ temp.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 6);
temp.muteState = (am_MuteState_e) sqlite3_column_int(query, 7);
temp.mainVolume = sqlite3_column_int(query, 8);
temp.sinkID = sqlite3_column_int(query, 9);
@@ -2366,7 +2361,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
temp.listConnectionFormats.push_back(tempConnectionFormat);
}
@@ -2377,7 +2372,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL)
while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
{
- tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+ tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
temp.listSoundProperties.push_back(tempSoundProperty);
}
@@ -2389,7 +2384,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
MY_SQLITE_PREPARE_V2(mpDatabase, commandNotificationConfiguration.c_str(), -1, &qNotificationConfiguration, NULL)
while ((eCode = sqlite3_step(qNotificationConfiguration)) == SQLITE_ROW)
{
- tempNotificationConfiguration.type = static_cast<am_NotificationType_e> (sqlite3_column_int(qNotificationConfiguration, 0));
+ tempNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (sqlite3_column_int(qNotificationConfiguration, 0));
tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (sqlite3_column_int(qNotificationConfiguration, 1));
tempNotificationConfiguration.parameter = static_cast<int16_t> (sqlite3_column_int(qNotificationConfiguration, 2));
temp.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -2404,7 +2399,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
{
- tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+ tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
temp.listMainSoundProperties.push_back(tempMainSoundProperty);
}
@@ -2416,7 +2411,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
MY_SQLITE_PREPARE_V2(mpDatabase, commandMainNotificationConfiguration.c_str(), -1, &qMainNotificationConfiguration, NULL)
while ((eCode = sqlite3_step(qMainNotificationConfiguration)) == SQLITE_ROW)
{
- tempMainNotificationConfiguration.type = static_cast <am_NotificationType_e> (sqlite3_column_int(qMainNotificationConfiguration, 0));
+ tempMainNotificationConfiguration.type = static_cast <am_CustomNotificationType_t> (sqlite3_column_int(qMainNotificationConfiguration, 0));
tempMainNotificationConfiguration.status = static_cast <am_NotificationStatus_e> (sqlite3_column_int(qMainNotificationConfiguration, 1));
tempMainNotificationConfiguration.parameter = static_cast <uint16_t>(sqlite3_column_int(qMainNotificationConfiguration, 2));
temp.listMainNotificationConfigurations.push_back(tempMainNotificationConfiguration);
@@ -2449,7 +2444,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qMAinSoundProperty = NULL, *qNotification(NULL), *qMainNotification(NULL);
int eCode = 0;
am_Source_s temp;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
am_SoundProperty_s tempSoundProperty;
am_MainSoundProperty_s tempMainSoundProperty;
am_NotificationConfiguration_s tempNotificationConfiguration;
@@ -2465,7 +2460,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
temp.volume = sqlite3_column_int(query, 4);
temp.visible = sqlite3_column_int(query, 5);
temp.available.availability = (am_Availability_e) sqlite3_column_int(query, 6);
- temp.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 7);
+ temp.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 7);
temp.interruptState = (am_InterruptState_e) sqlite3_column_int(query, 8);
temp.sourceID = sqlite3_column_int(query, 9);
@@ -2474,7 +2469,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
temp.listConnectionFormats.push_back(tempConnectionFormat);
}
@@ -2485,7 +2480,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL)
while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
{
- tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+ tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
temp.listSoundProperties.push_back(tempSoundProperty);
}
@@ -2497,7 +2492,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW)
{
- tempNotificationConfiguration.type = static_cast<am_NotificationType_e>(sqlite3_column_int(qNotification, 0));
+ tempNotificationConfiguration.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qNotification, 0));
tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qNotification, 1));
tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qNotification, 2));
temp.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -2511,7 +2506,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
{
- tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+ tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
temp.listMainSoundProperties.push_back(tempMainSoundProperty);
}
@@ -2523,7 +2518,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW)
{
- tempNotificationConfiguration.type = static_cast<am_NotificationType_e>(sqlite3_column_int(qMainNotification, 0));
+ tempNotificationConfiguration.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qMainNotification, 0));
tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qMainNotification, 1));
tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qMainNotification, 2));
temp.listMainNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -2574,7 +2569,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSourceClasses(std::vector<am_SourceC
while ((eCode1 = sqlite3_step(subQuery)) == SQLITE_ROW)
{
- propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(subQuery, 0);
+ propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(subQuery, 0);
propertyTemp.value = sqlite3_column_int(subQuery, 1);
classTemp.listClassProperties.push_back(propertyTemp);
}
@@ -2642,7 +2637,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListGateways(std::vector<am_Gateway_s> &
sqlite3_stmt* query = NULL, *qSinkConnectionFormat = NULL, *qSourceConnectionFormat = NULL;
int eCode = 0;
am_Gateway_s temp;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
std::string command = "SELECT name, sinkID, sourceID, domainSinkID, domainSourceID, controlDomainID, gatewayID FROM " + std::string(GATEWAY_TABLE);
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
@@ -2673,7 +2668,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListGateways(std::vector<am_Gateway_s> &
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSourceConnectionFormat, NULL)
while ((eCode = sqlite3_step(qSourceConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSourceConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSourceConnectionFormat, 0);
temp.listSourceFormats.push_back(tempConnectionFormat);
}
@@ -2684,7 +2679,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListGateways(std::vector<am_Gateway_s> &
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSinkConnectionFormat, NULL)
while ((eCode = sqlite3_step(qSinkConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSinkConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSinkConnectionFormat, 0);
temp.listSinkFormats.push_back(tempConnectionFormat);
}
@@ -2731,7 +2726,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinkClasses(std::vector<am_SinkClass
while ((eCode = sqlite3_step(subQuery)) == SQLITE_ROW)
{
- propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(subQuery, 0);
+ propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(subQuery, 0);
propertyTemp.value = sqlite3_column_int(subQuery, 1);
classTemp.listClassProperties.push_back(propertyTemp);
}
@@ -2807,7 +2802,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSinks(std::vector<am_SinkType_s>
temp.name = std::string((const char*) sqlite3_column_text(query, 0));
temp.sinkID = sqlite3_column_int(query, 1);
temp.availability.availability = (am_Availability_e) sqlite3_column_int(query, 2);
- temp.availability.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 3);
+ temp.availability.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 3);
temp.muteState = (am_MuteState_e) sqlite3_column_int(query, 4);
temp.volume = sqlite3_column_int(query, 5);
temp.sinkClassID = sqlite3_column_int(query, 6);
@@ -2840,7 +2835,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSources(std::vector<am_SourceTyp
temp.name = std::string((const char*) sqlite3_column_text(query, 0));
temp.sourceClassID = sqlite3_column_int(query, 1);
temp.availability.availability = (am_Availability_e) sqlite3_column_int(query, 2);
- temp.availability.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 3);
+ temp.availability.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 3);
temp.sourceID = sqlite3_column_int(query, 4);
listMainSources.push_back(temp);
@@ -2873,7 +2868,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSinkSoundProperties(const am_sin
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- temp.type = (am_MainSoundPropertyType_e) sqlite3_column_int(query, 0);
+ temp.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(query, 0);
temp.value = sqlite3_column_int(query, 1);
listSoundProperties.push_back(temp);
}
@@ -2905,7 +2900,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSourceSoundProperties(const am_s
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- temp.type = (am_MainSoundPropertyType_e) sqlite3_column_int(query, 0);
+ temp.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(query, 0);
temp.value = sqlite3_column_int(query, 1);
listSourceProperties.push_back(temp);
}
@@ -2934,7 +2929,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSystemProperties(std::vector<am_Syst
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- temp.type = (am_SystemPropertyType_e) sqlite3_column_int(query, 0);
+ temp.type = (am_CustomSystemPropertyType_t) sqlite3_column_int(query, 0);
temp.value = sqlite3_column_int(query, 1);
listSystemProperties.push_back(temp);
}
@@ -2951,17 +2946,17 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSystemProperties(std::vector<am_Syst
return (E_OK);
}
-am_Error_e am::CAmDatabaseHandlerSQLite::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerSQLite::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
{
listConnectionFormats.clear();
sqlite3_stmt *qConnectionFormat = NULL;
int eCode = 0;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
std::string commandConnectionFormat = "SELECT soundFormat FROM SinkConnectionFormat" + i2s(sinkID);
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
listConnectionFormats.push_back(tempConnectionFormat);
}
@@ -2970,19 +2965,19 @@ am_Error_e am::CAmDatabaseHandlerSQLite::getListSinkConnectionFormats(const am_s
return (E_OK);
}
-am_Error_e am::CAmDatabaseHandlerSQLite::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerSQLite::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
{
listConnectionFormats.clear();
sqlite3_stmt* qConnectionFormat = NULL;
int eCode = 0;
- am_ConnectionFormat_e tempConnectionFormat;
+ am_CustomConnectionFormat_t tempConnectionFormat;
//read out the connectionFormats
std::string commandConnectionFormat = "SELECT soundFormat FROM SourceConnectionFormat" + i2s(sourceID);
MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
{
- tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+ tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
listConnectionFormats.push_back(tempConnectionFormat);
}
@@ -4039,7 +4034,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceVolume(const am_sourceID_t sourceI
return (E_OK);
}
-am_Error_e CAmDatabaseHandlerSQLite::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerSQLite::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
{
assert(sinkID!=0);
if (!existSink(sinkID))
@@ -4066,7 +4061,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkSoundPropertyValue(const am_sinkID_t
return (E_OK);
}
-am_Error_e CAmDatabaseHandlerSQLite::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerSQLite::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
{
assert(sourceID!=0);
if (!existSource(sourceID))
@@ -4310,7 +4305,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceVolume(const am_sourceID_t sour
am_Error_e CAmDatabaseHandlerSQLite::changeSourceSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sourceID_t sourceID)
{
- assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
assert(sourceID!=0);
sqlite3_stmt* query = NULL;
@@ -4338,7 +4332,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceSoundPropertyDB(const am_SoundP
am_Error_e CAmDatabaseHandlerSQLite::changeSinkSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sinkID_t sinkID)
{
- assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
assert(sinkID!=0);
sqlite3_stmt* query = NULL;
@@ -4510,7 +4503,7 @@ am_Error_e am::CAmDatabaseHandlerSQLite::peekSourceClassID(const std::string & n
}
-am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
assert(sourceID!=0);
@@ -4591,7 +4584,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID
//fill ConnectionFormats
command = "INSERT INTO SourceConnectionFormat" + i2s(sourceID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
for (; connectionFormatIterator < listConnectionFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -4647,7 +4640,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID
}
-am_Error_e CAmDatabaseHandlerSQLite::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerSQLite::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
assert(sinkID!=0);
@@ -4728,7 +4721,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSinkDB(const am_sinkID_t sinkID, cons
//fill ConnectionFormats
command = "INSERT INTO SinkConnectionFormat" + i2s(sinkID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
for (; connectionFormatIterator < listConnectionFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -4798,7 +4791,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSinkNotificationConfigurations(c
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- temp.type = static_cast<am_NotificationType_e>(sqlite3_column_int(query, 0));
+ temp.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(query, 0));
temp.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(query, 1));
temp.parameter= static_cast<int16_t>(sqlite3_column_int(query, 2));
listMainNotificationConfigurations.push_back(temp);
@@ -4832,7 +4825,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSourceNotificationConfigurations
while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
{
- temp.type = static_cast<am_NotificationType_e>(sqlite3_column_int(query, 0));
+ temp.type = static_cast<am_CustomNotificationType_t>(sqlite3_column_int(query, 0));
temp.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(query, 1));
temp.parameter= static_cast<int16_t>(sqlite3_column_int(query, 2));
listMainNotificationConfigurations.push_back(temp);
@@ -4912,7 +4905,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeMainSourceNotificationConfigurationDB
return (E_OK);
}
-am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
{
assert(gatewayID!=0);
@@ -4935,7 +4928,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewa
//fill ConnectionFormats
command = "INSERT INTO GatewaySourceFormat" + i2s(gatewayID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listSourceConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listSourceConnectionFormats.begin();
for (; connectionFormatIterator < listSourceConnectionFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -4959,7 +4952,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewa
command = "INSERT INTO GatewaySinkFormat" + i2s(gatewayID) + std::string("(soundFormat) VALUES (?)");
MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
- std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listSinkConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listSinkConnectionFormats.begin();
for (; connectionFormatIterator < listSinkConnectionFormats.end(); ++connectionFormatIterator)
{
MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
diff --git a/AudioManagerDaemon/src/CAmRouter.cpp b/AudioManagerDaemon/src/CAmRouter.cpp
index c471ea3..d574e45 100644
--- a/AudioManagerDaemon/src/CAmRouter.cpp
+++ b/AudioManagerDaemon/src/CAmRouter.cpp
@@ -59,7 +59,7 @@ am_Error_e CAmRouter::getRoute(const bool onlyfree, const am_sourceID_t sourceID
if (sourceDomainID == sinkDomainID) //shortcut if the domains are the same...
{
//first get the list of possible connection formats
- std::vector<am_ConnectionFormat_e> listFormats, listPriorityConnectionFormats;
+ std::vector<am_CustomConnectionFormat_t> listFormats, listPriorityConnectionFormats;
listPossibleConnectionFormats(sourceID, sinkID, listFormats);
//dummy route
@@ -169,24 +169,24 @@ am_Error_e CAmRouter::getRoute(const bool onlyfree, const am_sourceID_t sourceID
return (E_OK);
}
-void CAmRouter::listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e>& listFormats) const
+void CAmRouter::listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t>& listFormats) const
{
- std::vector<am_ConnectionFormat_e> listSourceFormats;
- std::vector<am_ConnectionFormat_e> listSinkFormats;
+ std::vector<am_CustomConnectionFormat_t> listSourceFormats;
+ std::vector<am_CustomConnectionFormat_t> listSinkFormats;
mpDatabaseHandler->getListSinkConnectionFormats(sinkID, listSinkFormats);
mpDatabaseHandler->getListSourceConnectionFormats(sourceID, listSourceFormats);
std::sort(listSinkFormats.begin(), listSinkFormats.end()); //todo: this might be not needed if we use strictly sorted input
std::sort(listSourceFormats.begin(), listSourceFormats.end()); //todo: this might be not needed if we use strictly sorted input
- std::insert_iterator<std::vector<am_ConnectionFormat_e> > inserter(listFormats, listFormats.begin());
+ std::insert_iterator<std::vector<am_CustomConnectionFormat_t> > inserter(listFormats, listFormats.begin());
set_intersection(listSourceFormats.begin(), listSourceFormats.end(), listSinkFormats.begin(), listSinkFormats.end(), inserter);
}
am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s> & listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator)
{
am_Error_e returnError = E_NOT_POSSIBLE;
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
- std::vector<am_ConnectionFormat_e> listMergeConnectionFormats;
- std::vector<am_ConnectionFormat_e> listPriorityConnectionFormats;
+ std::vector<am_CustomConnectionFormat_t> listConnectionFormats;
+ std::vector<am_CustomConnectionFormat_t> listMergeConnectionFormats;
+ std::vector<am_CustomConnectionFormat_t> listPriorityConnectionFormats;
std::vector<am_RoutingElement_s>::iterator nextIterator = routeIterator + 1;
//get best connection format
listPossibleConnectionFormats(routeIterator->sourceID, routeIterator->sinkID, listConnectionFormats);
@@ -195,8 +195,8 @@ am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, st
if (routeIterator != listRoute.begin())
{
//since we have to deal with Gateways, there are restrictions what connectionFormat we can take. So we need to take the subset of connections that are restricted:
- std::vector<am_ConnectionFormat_e> listRestrictedConnectionFormats;
- std::insert_iterator<std::vector<am_ConnectionFormat_e> > inserter(listMergeConnectionFormats, listMergeConnectionFormats.begin());
+ std::vector<am_CustomConnectionFormat_t> listRestrictedConnectionFormats;
+ std::insert_iterator<std::vector<am_CustomConnectionFormat_t> > inserter(listMergeConnectionFormats, listMergeConnectionFormats.begin());
std::vector<am_RoutingElement_s>::iterator tempIterator(routeIterator);
tempIterator--;
listRestrictedOutputFormatsGateways(*gatewayIterator, (tempIterator)->connectionFormat, listRestrictedConnectionFormats);
@@ -218,7 +218,7 @@ am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, st
mpControlSender->getConnectionFormatChoice(routeIterator->sourceID, routeIterator->sinkID, route, listMergeConnectionFormats, listPriorityConnectionFormats);
//we have the list sorted after prios - now we try one after the other with the next part of the route
- std::vector<am_ConnectionFormat_e>::iterator connectionFormatIterator = listPriorityConnectionFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::iterator connectionFormatIterator = listPriorityConnectionFormats.begin();
//here we need to check if we are at the end and stop
if (nextIterator == listRoute.end())
@@ -244,12 +244,12 @@ am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, st
return (returnError);
}
-void CAmRouter::listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector<am_ConnectionFormat_e> & listFormats) const
+void CAmRouter::listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_CustomConnectionFormat_t sinkConnectionFormat, std::vector<am_CustomConnectionFormat_t> & listFormats) const
{
listFormats.clear();
am_Gateway_s gatewayData;
mpDatabaseHandler->getGatewayInfoDB(gatewayID, gatewayData);
- std::vector<am_ConnectionFormat_e>::const_iterator rowSinkIterator = gatewayData.listSinkFormats.begin();
+ std::vector<am_CustomConnectionFormat_t>::const_iterator rowSinkIterator = gatewayData.listSinkFormats.begin();
std::vector<bool>::const_iterator matrixIterator = gatewayData.convertionMatrix.begin();
//find the row number of the sink
diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
index a6c769f..eaa38e1 100644
--- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
@@ -413,17 +413,17 @@ void CAmRoutingReceiver::ackSourceNotificationConfiguration(const am_Handle_s ha
mpControlSender->cbAckSetSourceNotificationConfiguration(handle,error);
}
-am_Error_e CAmRoutingReceiver::updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceFormats, const std::vector<am_ConnectionFormat_e>& listSinkFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmRoutingReceiver::updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkFormats, const std::vector<bool>& convertionMatrix)
{
return (mpControlSender->hookSystemUpdateGateway(gatewayID,listSourceFormats,listSinkFormats,convertionMatrix));
}
-am_Error_e CAmRoutingReceiver::updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmRoutingReceiver::updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
return (mpControlSender->hookSystemUpdateSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
}
-am_Error_e CAmRoutingReceiver::updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmRoutingReceiver::updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
return (mpControlSender->hookSystemUpdateSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
}
diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp
index 5f7f03a..1606761 100644
--- a/AudioManagerDaemon/src/CAmRoutingSender.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp
@@ -202,7 +202,7 @@ am_Error_e CAmRoutingSender::asyncAbort(const am_Handle_s& handle)
return (E_NON_EXISTENT);
}
-am_Error_e CAmRoutingSender::asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)
+am_Error_e CAmRoutingSender::asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat)
{
am_handleData_c handleData;
SinkInterfaceMap::iterator iter = mMapSinkInterface.begin();
@@ -236,7 +236,7 @@ am_Error_e CAmRoutingSender::asyncDisconnect(am_Handle_s& handle, const am_conne
return (E_NON_EXISTENT);
}
-am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
am_handleData_c handleData;
SinkInterfaceMap::iterator iter = mMapSinkInterface.begin();
@@ -252,7 +252,7 @@ am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_si
return (E_NON_EXISTENT);
}
-am_Error_e CAmRoutingSender::asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSender::asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
am_handleData_c handleData;
SourceInterfaceMap::iterator iter = mMapSourceInterface.begin();
@@ -349,7 +349,7 @@ am_Error_e CAmRoutingSender::asyncSetSinkSoundProperties(am_Handle_s& handle, co
}
-am_Error_e CAmRoutingSender::asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmRoutingSender::asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time)
{
am_handleData_c handleData;
CrossfaderInterfaceMap::iterator iter = mMapCrossfaderInterface.begin();
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
index 9067339..1fb3ddf 100644
--- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
@@ -883,10 +883,7 @@ void CAmTelnetMenuHelper::setSourceSoundPropertyExec(std::queue<std::string>& Cm
error = true;
am_MainSoundProperty_s soundProperty;
- if (tmpType < MSP_MAX)
- soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType);
- else
- error = true;
+ soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType);
if (!(istream_value >> soundProperty.value))
error = true;
@@ -1147,10 +1144,7 @@ void CAmTelnetMenuHelper::setSourceSoundPropertiesExec(std::queue<std::string>&
error = true;
am_MainSoundProperty_s soundProperty;
- if (tmpType < MSP_MAX)
- soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType);
- else
- error = true;
+ soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType);
if (!(istream_value >> soundProperty.value))
error = true;
@@ -1207,10 +1201,7 @@ void CAmTelnetMenuHelper::setSinkSoundPropertyExec(std::queue<std::string>& CmdQ
error = true;
am_MainSoundProperty_s soundProperty;
- if (tmpType < MSP_MAX)
- soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType);
- else
- error = true;
+ soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType);
if (!(istream_value >> soundProperty.value))
error = true;
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
index 3c4af7d..5448c7d 100644
--- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
@@ -492,7 +492,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
domain.busname = "mock";
sink.sinkID = 2;
sink.domainID = 1;
- soundProperty.type = SP_EXAMPLE_BASS;
+ soundProperty.type = SP_GENIVI_BASS;
soundProperty.value = 244;
//setup environment, we need a domain and a sink
@@ -509,7 +509,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
ASSERT_EQ(handlesList[0].handleType, H_SETSINKSOUNDPROPERTY);
//read out this property. There is no change, because the ack did not arrive yet.
- ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue));
+ ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_GENIVI_BASS,oldvalue));
ASSERT_EQ(sink.listSoundProperties[0].value, oldvalue);
//lets send the answer and expect a call on the controlInterface
@@ -517,7 +517,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
pRoutingReceiver.ackSetSinkSoundProperty(handle, E_OK);
//finally, the new value must be in the database
- ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_EXAMPLE_BASS,oldvalue));
+ ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_GENIVI_BASS,oldvalue));
ASSERT_EQ(soundProperty.value, oldvalue);
//and the handle must be destroyed
@@ -545,7 +545,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
domain.busname = "mock";
source.sourceID = 2;
source.domainID = 1;
- soundProperty.type = SP_EXAMPLE_BASS;
+ soundProperty.type = SP_GENIVI_BASS;
soundProperty.value = 244;
//prepare the scene
@@ -562,7 +562,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
ASSERT_EQ(handlesList[0].handleType, H_SETSOURCESOUNDPROPERTY);
//read out this property. There is no change, because the ack did not arrive yet.
- ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue));
+ ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_GENIVI_BASS,oldvalue));
ASSERT_EQ(source.listSoundProperties[0].value, oldvalue);
//lets send the answer and expect a call on the controlInterface
@@ -570,7 +570,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
pRoutingReceiver.ackSetSourceSoundProperty(handle, E_OK);
//finally, the new value must be in the database
- ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_EXAMPLE_BASS,oldvalue));
+ ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_GENIVI_BASS,oldvalue));
ASSERT_EQ(soundProperty.value, oldvalue);
//and the handle must be destroyed
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
index 6b61816..1881955 100644
--- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
@@ -2077,7 +2077,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
@@ -2112,7 +2112,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
@@ -2147,12 +2147,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=10;
@@ -2197,12 +2197,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=27;
diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
index ae05960..25c61cc 100644
--- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
@@ -2092,7 +2092,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
@@ -2127,7 +2127,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
@@ -2162,12 +2162,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=10;
@@ -2215,12 +2215,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=27;
@@ -2524,7 +2524,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSource)
})!=listSources.end();
ASSERT_TRUE(containsSourceID);
std::vector<am_SoundProperty_s> listSoundProperties;
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
+ std::vector<am_CustomAvailabilityReason_t> listConnectionFormats;
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sourceUpdated(sourceID, _, _, _)).Times(1);
ASSERT_EQ(E_OK,pDatabaseHandler.changeSourceDB(sourceID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error";
@@ -2570,7 +2570,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSink)
})!=listSinks.end();
ASSERT_TRUE(containsSourceID);
std::vector<am_SoundProperty_s> listSoundProperties;
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
+ std::vector<am_CustomAvailabilityReason_t> listConnectionFormats;
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sinkUpdated(sinkID, _, _, _)).Times(1);
ASSERT_EQ(E_OK,pDatabaseHandler.changeSinkDB(sinkID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error";
@@ -2858,12 +2858,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSink)
testSinkData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=27;
@@ -2896,12 +2896,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSources)
testSourceData.listMainNotificationConfigurations.push_back(notify);
am_NotificationConfiguration_s notify1;
- notify1.type=NT_MAX;
+ notify1.type=NT_UNKNOWN;
notify1.status=NS_PERIODIC;
notify1.parameter=5;
am_NotificationConfiguration_s notify2;
- notify2.type=NT_MAX;
+ notify2.type=NT_UNKNOWN;
notify2.status=NS_CHANGE;
notify2.parameter=10;
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
index d3415c4..42ef261 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
@@ -142,7 +142,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange)
am_domainID_t domainID;
am_Handle_s handle;
am_SoundProperty_s soundProperty;
- soundProperty.type = SP_EXAMPLE_TREBLE;
+ soundProperty.type = SP_GENIVI_TREBLE;
soundProperty.value = 23;
std::vector<am_Handle_s> listHandles;
pCF.createSink(sink);
@@ -215,7 +215,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty)
am_Handle_s handle;
am_SoundProperty_s soundProperty;
soundProperty.value=5;
- soundProperty.type=SP_EXAMPLE_MID;
+ soundProperty.type=SP_GENIVI_MID;
std::vector<am_Handle_s> listHandles;
pCF.createSink(sink);
pCF.createDomain(domain);
@@ -244,7 +244,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange)
am_domainID_t domainID;
am_Handle_s handle;
am_volume_t volume = 34;
- am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
am_time_t rampTime = 300;
std::vector<am_Handle_s> listHandles;
pCF.createSource(source);
@@ -270,7 +270,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolume)
am_domainID_t domainID;
am_Handle_s handle;
am_volume_t volume = 34;
- am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
am_time_t rampTime = 300;
std::vector<am_Handle_s> listHandles;
pCF.createSource(source);
@@ -298,7 +298,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange)
am_domainID_t domainID;
am_Handle_s handle;
am_volume_t volume = 34;
- am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
am_time_t rampTime = 300;
std::vector<am_Handle_s> listHandles;
pCF.createSink(sink);
@@ -324,7 +324,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolume)
am_domainID_t domainID;
am_Handle_s handle;
am_volume_t volume = 34;
- am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
am_time_t rampTime = 300;
std::vector<am_Handle_s> listHandles;
pCF.createSink(sink);
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
index d8c2e03..47b09e6 100644
--- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
@@ -205,9 +205,9 @@ bool CAmCommonFunctions::compareRoute(am_Route_s a, am_Route_s b)
return retVal;
}
-std::vector<am_ConnectionFormat_e> CAmCommonFunctions::getStandardConnectionFormatList()
+std::vector<am_CustomAvailabilityReason_t> CAmCommonFunctions::getStandardConnectionFormatList()
{
- std::vector<am_ConnectionFormat_e> list;
+ std::vector<am_CustomAvailabilityReason_t> list;
list.push_back(CF_GENIVI_ANALOG);
list.push_back(CF_GENIVI_STEREO);
return list;
@@ -217,10 +217,10 @@ std::vector<am_SoundProperty_s> CAmCommonFunctions::getStandardSoundPropertyList
{
std::vector<am_SoundProperty_s> soundPropertyList;
am_SoundProperty_s soundProperty;
- soundProperty.type = SP_EXAMPLE_BASS;
+ soundProperty.type = SP_GENIVI_BASS;
soundProperty.value = 23;
soundPropertyList.push_back(soundProperty);
- soundProperty.type = SP_EXAMPLE_MID;
+ soundProperty.type = SP_GENIVI_MID;
soundProperty.value = 2;
soundPropertyList.push_back(soundProperty);
return soundPropertyList;
@@ -331,7 +331,7 @@ std::vector<am_NotificationConfiguration_s> am::CAmCommonFunctions::getStandardN
am_NotificationConfiguration_s tempNotificationConfiguration;
tempNotificationConfiguration.parameter=12;
tempNotificationConfiguration.status=NS_PERIODIC;
- tempNotificationConfiguration.type=NT_MAX;
+ tempNotificationConfiguration.type=NT_UNKNOWN;
listNotificationConfigurations.push_back(tempNotificationConfiguration);
tempNotificationConfiguration.parameter=16;
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h
index 0c9e362..345d178 100644
--- a/AudioManagerDaemon/test/CAmCommonFunctions.h
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.h
@@ -30,7 +30,7 @@ class CAmCommonFunctions
{
public:
- static std::vector<am_ConnectionFormat_e> getStandardConnectionFormatList();
+ static std::vector<am_CustomAvailabilityReason_t> getStandardConnectionFormatList();
static std::vector<am_SoundProperty_s> getStandardSoundPropertyList();
static std::vector<am_MainSoundProperty_s> getStandardMainSoundPropertyList();
static std::vector<bool> getStandardConvertionMatrix();
@@ -59,7 +59,7 @@ public:
struct sortByConnectionFormat
{
- bool operator()(const am_ConnectionFormat_e & a, const am_ConnectionFormat_e & b) const
+ bool operator()(const am_CustomAvailabilityReason_t & a, const am_CustomAvailabilityReason_t & b) const
{
return (a < b);
}
diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h
index fca6073..5d9b528 100644
--- a/AudioManagerDaemon/test/MockIAmControlSend.h
+++ b/AudioManagerDaemon/test/MockIAmControlSend.h
@@ -114,7 +114,7 @@ class MockIAmControlSend : public IAmControlSend {
MOCK_METHOD2(cbAckSetSinkSoundProperty,
void(const am_Handle_s handle, const am_Error_e error));
MOCK_METHOD5(getConnectionFormatChoice,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
+ am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomAvailabilityReason_t> listPossibleConnectionFormats, std::vector<am_CustomAvailabilityReason_t>& listPrioConnectionFormats));
MOCK_METHOD1(confirmCommandReady,
void(const am_Error_e error));
MOCK_METHOD1(confirmRoutingReady,
@@ -124,11 +124,11 @@ class MockIAmControlSend : public IAmControlSend {
MOCK_METHOD1(confirmRoutingRundown,
void(const am_Error_e error));
MOCK_METHOD5(hookSystemUpdateSink,
- am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+ am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
MOCK_METHOD5(hookSystemUpdateSource,
- am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+ am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
MOCK_METHOD4(hookSystemUpdateGateway,
- am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
+ am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
MOCK_METHOD3(cbAckSetVolumes,
void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error));
MOCK_METHOD2(cbAckSetSinkNotificationConfiguration,
diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h
index 029790e..6ebb94d 100644
--- a/AudioManagerDaemon/test/MockIAmRoutingSend.h
+++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h
@@ -40,13 +40,13 @@ class MockIAmRoutingSend : public IAmRoutingSend {
MOCK_METHOD1(asyncAbort,
am_Error_e(const am_Handle_s handle));
MOCK_METHOD5(asyncConnect,
- am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat));
+ am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomAvailabilityReason_t connectionFormat));
MOCK_METHOD2(asyncDisconnect,
am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID));
MOCK_METHOD5(asyncSetSinkVolume,
- am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
+ am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time));
MOCK_METHOD5(asyncSetSourceVolume,
- am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
+ am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time));
MOCK_METHOD3(asyncSetSourceState,
am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state));
MOCK_METHOD3(asyncSetSinkSoundProperties,
@@ -58,7 +58,7 @@ class MockIAmRoutingSend : public IAmRoutingSend {
MOCK_METHOD3(asyncSetSourceSoundProperty,
am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty));
MOCK_METHOD5(asyncCrossFade,
- am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time));
+ am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time));
MOCK_METHOD2(setDomainState,
am_Error_e(const am_domainID_t domainID, const am_DomainState_e domainState));
MOCK_CONST_METHOD1(returnBusName,
diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
index 750b2c5..caeb455 100644
--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
+++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h
@@ -32,22 +32,14 @@ extern void CAmConvertAvailablility(const am_Availability_s & , org::genivi::am:
extern void CAmConvertMainSoundProperty(const am_MainSoundProperty_s & , org::genivi::am::am_MainSoundProperty_s & );
extern void CAmConvertSystemProperty(const am_SystemProperty_s &, org::genivi::am::am_SystemProperty_s &);
-extern org::genivi::am::am_ClassProperty_pe CAmConvert2CAPIType(const am_ClassProperty_e & property);
-extern org::genivi::am::am_SystemPropertyType_pe CAmConvert2CAPIType(const am_SystemPropertyType_e &);
-extern org::genivi::am::am_Availability_e CAmConvert2CAPIType(const am_Availability_e & );
-extern org::genivi::am::am_AvailabilityReason_pe CAmConvert2CAPIType(const am_AvailabilityReason_e & );
+extern org::genivi::am::am_Availability_e CAmConvert2CAPIType(const am_Availability_e &);
extern org::genivi::am::am_MuteState_e CAmConvert2CAPIType(const am_MuteState_e &);
extern am_MuteState_e CAmConvertFromCAPIType(const org::genivi::am::am_MuteState_e &);
-extern org::genivi::am::am_MainSoundPropertyType_pe CAmConvert2CAPIType(const am_MainSoundPropertyType_e &);
-
extern org::genivi::am::am_ConnectionState_e CAmConvert2CAPIType(const am_ConnectionState_e &);
extern am_ConnectionState_e CAmConvertFromCAPIType(const org::genivi::am::am_ConnectionState_e &);
-extern am_NotificationType_e CAmConvert2CAPIType(const org::genivi::am::am_NotificationType_pe &);
-extern org::genivi::am::am_NotificationType_pe CAmConvertFromCAPIType(const am_NotificationType_e &);
-
extern am_NotificationStatus_e CAmConvert2CAPIType(const org::genivi::am::am_NotificationStatus_e &);
extern org::genivi::am::am_NotificationStatus_e CAmConvertFromCAPIType(const am_NotificationStatus_e &);
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp
index f79c0f5..161a7b7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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 Christian Linke
@@ -112,7 +101,7 @@ void am_Route_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) cons
outputStream << route;
}
-am_Availability_s::am_Availability_s(const am_Availability_e& availabilityValue, const am_AvailabilityReason_pe& availabilityReasonValue):
+am_Availability_s::am_Availability_s(const am_Availability_e& availabilityValue, const am_CustomAvailabilityReason_t& availabilityReasonValue):
availability(availabilityValue),
availabilityReason(availabilityReasonValue)
{
@@ -139,7 +128,7 @@ void am_Availability_s::writeToOutputStream(CommonAPI::OutputStream& outputStrea
outputStream << availabilityReason;
}
-am_ClassProperty_s::am_ClassProperty_s(const am_ClassProperty_pe& classPropertyValue, const int16_t& valueValue):
+am_ClassProperty_s::am_ClassProperty_s(const am_CustomClassProperty_t& classPropertyValue, const int16_t& valueValue):
classProperty(classPropertyValue),
value(valueValue)
{
@@ -268,7 +257,7 @@ void am_Gateway_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) co
outputStream << convertionMatrix;
}
-am_RoutingElement_s::am_RoutingElement_s(const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_domainID_t& domainIDValue, const am_ConnectionFormat_pe& connectionFormatValue):
+am_RoutingElement_s::am_RoutingElement_s(const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_domainID_t& domainIDValue, const am_CustomConnectionFormat_t& connectionFormatValue):
sourceID(sourceIDValue),
sinkID(sinkIDValue),
domainID(domainIDValue),
@@ -303,7 +292,7 @@ void am_RoutingElement_s::writeToOutputStream(CommonAPI::OutputStream& outputStr
outputStream << connectionFormat;
}
-am_SoundProperty_s::am_SoundProperty_s(const am_SoundPropertyType_pe& typeValue, const int16_t& valueValue):
+am_SoundProperty_s::am_SoundProperty_s(const am_CustomSoundPropertyType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -330,7 +319,7 @@ void am_SoundProperty_s::writeToOutputStream(CommonAPI::OutputStream& outputStre
outputStream << value;
}
-am_SystemProperty_s::am_SystemProperty_s(const am_SystemPropertyType_pe& typeValue, const int16_t& valueValue):
+am_SystemProperty_s::am_SystemProperty_s(const am_CustomSystemPropertyType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -524,7 +513,7 @@ void am_Handle_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) con
outputStream << handle;
}
-am_MainSoundProperty_s::am_MainSoundProperty_s(const am_MainSoundPropertyType_pe& typeValue, const int16_t& valueValue):
+am_MainSoundProperty_s::am_MainSoundProperty_s(const am_CustomMainSoundPropertyType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -633,7 +622,7 @@ void am_MainConnection_s::writeToOutputStream(CommonAPI::OutputStream& outputStr
outputStream << listConnectionID;
}
-am_NotificationPayload_s::am_NotificationPayload_s(const am_NotificationType_pe& typeValue, const int16_t& valueValue):
+am_NotificationPayload_s::am_NotificationPayload_s(const am_CustomNotificationType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -660,7 +649,7 @@ void am_NotificationPayload_s::writeToOutputStream(CommonAPI::OutputStream& outp
outputStream << value;
}
-am_NotificationConfiguration_s::am_NotificationConfiguration_s(const am_NotificationType_pe& typeValue, const am_NotificationStatus_e& statusValue, const int16_t& parameterValue):
+am_NotificationConfiguration_s::am_NotificationConfiguration_s(const am_CustomNotificationType_t& typeValue, const am_NotificationStatus_e& statusValue, const int16_t& parameterValue):
type(typeValue),
status(statusValue),
parameter(parameterValue)
@@ -919,7 +908,7 @@ void am_EarlyData_s::writeToOutputStream(CommonAPI::OutputStream& outputStream)
outputStream << data;
}
-am_Connection_s::am_Connection_s(const am_connectionID_t& connectionIDValue, const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_timeSync_t& delayValue, const am_ConnectionFormat_pe& connectionFormatValue):
+am_Connection_s::am_Connection_s(const am_connectionID_t& connectionIDValue, const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_timeSync_t& delayValue, const am_CustomConnectionFormat_t& connectionFormatValue):
connectionID(connectionIDValue),
sourceID(sourceIDValue),
sinkID(sinkIDValue),
@@ -958,7 +947,7 @@ void am_Connection_s::writeToOutputStream(CommonAPI::OutputStream& outputStream)
outputStream << connectionFormat;
}
-am_Volumes_s::am_Volumes_s(const am_VolumeType_e& volumeTypeValue, const am_DataType_u& volumeIDValue, const am_volume_t& volumeValue, const am_RampType_pe& rampValue, const am_time_t& timeValue):
+am_Volumes_s::am_Volumes_s(const am_VolumeType_e& volumeTypeValue, const am_DataType_u& volumeIDValue, const am_volume_t& volumeValue, const am_CustomRampType_t& rampValue, const am_time_t& timeValue):
volumeType(volumeTypeValue),
volumeID(volumeIDValue),
volume(volumeValue),
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h
index adfd7b3..17c0c51 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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 Christian Linke
@@ -155,7 +144,7 @@ namespace am {
/**
* product specific identifier of property
*/
- typedef uint16_t am_ClassProperty_pe;
+ typedef uint16_t am_CustomClassProperty_t;
/**
* describes class properties
*/
@@ -166,14 +155,14 @@ namespace am {
/**
* the property as enum
*/
- am_ClassProperty_pe classProperty;
+ am_CustomClassProperty_t classProperty;
/**
* the value of the property
*/
int16_t value;
am_ClassProperty_s() = default;
- am_ClassProperty_s(const am_ClassProperty_pe& classProperty, const int16_t& value);
+ am_ClassProperty_s(const am_CustomClassProperty_t& classProperty, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -246,7 +235,7 @@ namespace am {
* This project specific value gives the information about reason for reason for
* Source/Sink change
*/
- typedef uint16_t am_AvailabilityReason_pe;
+ typedef uint16_t am_CustomAvailabilityReason_t;
/**
* with the help of this enum, sinks and sources can report their availability
* state
@@ -304,10 +293,10 @@ namespace am {
* the reason for the last change. This can be used to trigger events that deal
* with state changes.
*/
- am_AvailabilityReason_pe availabilityReason;
+ am_CustomAvailabilityReason_t availabilityReason;
am_Availability_s() = default;
- am_Availability_s(const am_Availability_e& availability, const am_AvailabilityReason_pe& availabilityReason);
+ am_Availability_s(const am_Availability_e& availability, const am_CustomAvailabilityReason_t& availabilityReason);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -473,7 +462,7 @@ namespace am {
/**
* describes the different system properties. Project specific
*/
- typedef uint16_t am_SystemPropertyType_pe;
+ typedef uint16_t am_CustomSystemPropertyType_t;
/**
* struct describing system properties
*/
@@ -484,14 +473,14 @@ namespace am {
/**
* the type that is set
*/
- am_SystemPropertyType_pe type;
+ am_CustomSystemPropertyType_t type;
/**
* the value
*/
int16_t value;
am_SystemProperty_s() = default;
- am_SystemProperty_s(const am_SystemPropertyType_pe& type, const int16_t& value);
+ am_SystemProperty_s(const am_CustomSystemPropertyType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -526,7 +515,7 @@ namespace am {
/**
* Project specific sound properties.
*/
- typedef uint16_t am_SoundPropertyType_pe;
+ typedef uint16_t am_CustomSoundPropertyType_t;
/**
* This enum characterizes the data of the EarlyData_t
*/
@@ -566,14 +555,14 @@ namespace am {
/**
* the type of the property - a project specific enum
*/
- am_SoundPropertyType_pe type;
+ am_CustomSoundPropertyType_t type;
/**
* the actual value of the property
*/
int16_t value;
am_SoundProperty_s() = default;
- am_SoundProperty_s(const am_SoundPropertyType_pe& type, const int16_t& value);
+ am_SoundProperty_s(const am_CustomSoundPropertyType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -639,7 +628,7 @@ namespace am {
* Here are all SoundProperties that can be set via the CommandInterface. Product
* specific
*/
- typedef uint16_t am_MainSoundPropertyType_pe;
+ typedef uint16_t am_CustomMainSoundPropertyType_t;
/**
* struct describung mainsound property
*/
@@ -650,14 +639,14 @@ namespace am {
/**
* the type of the property
*/
- am_MainSoundPropertyType_pe type;
+ am_CustomMainSoundPropertyType_t type;
/**
* the actual value
*/
int16_t value;
am_MainSoundProperty_s() = default;
- am_MainSoundProperty_s(const am_MainSoundPropertyType_pe& type, const int16_t& value);
+ am_MainSoundProperty_s(const am_CustomMainSoundPropertyType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -675,7 +664,7 @@ namespace am {
/**
* gives the type of the Notification.
*/
- typedef uint16_t am_NotificationType_pe;
+ typedef uint16_t am_CustomNotificationType_t;
enum class am_NotificationStatus_e: int32_t {
NS_UNKNOWN = 0,
/**
@@ -717,7 +706,7 @@ namespace am {
/**
* The notification type of the notification
*/
- am_NotificationType_pe type;
+ am_CustomNotificationType_t type;
/**
* The Notification status. This can be periodic, min/max value based or even off
* for example
@@ -738,7 +727,7 @@ namespace am {
int16_t parameter;
am_NotificationConfiguration_s() = default;
- am_NotificationConfiguration_s(const am_NotificationType_pe& type, const am_NotificationStatus_e& status, const int16_t& parameter);
+ am_NotificationConfiguration_s(const am_CustomNotificationType_t& type, const am_NotificationStatus_e& status, const int16_t& parameter);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -766,7 +755,7 @@ namespace am {
* This project specific value classifies the format in which data is exchanged
* within a connection.
*/
- typedef uint16_t am_ConnectionFormat_pe;
+ typedef uint16_t am_CustomConnectionFormat_t;
/**
* This represents one "hopp" in a route
*/
@@ -789,10 +778,10 @@ namespace am {
/**
* the connectionformat that is used for the route
*/
- am_ConnectionFormat_pe connectionFormat;
+ am_CustomConnectionFormat_t connectionFormat;
am_RoutingElement_s() = default;
- am_RoutingElement_s(const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_domainID_t& domainID, const am_ConnectionFormat_pe& connectionFormat);
+ am_RoutingElement_s(const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_domainID_t& domainID, const am_CustomConnectionFormat_t& connectionFormat);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -826,7 +815,7 @@ namespace am {
* responsibility of the product to make sure that the routing plugins are aware
* of the ramp types used.
*/
- typedef uint16_t am_RampType_pe;
+ typedef uint16_t am_CustomRampType_t;
/**
* This datatype determines if a sourceID or a sinkID is used in the union
* following
@@ -868,14 +857,14 @@ namespace am {
/**
* the ramp that shall be driven
*/
- am_RampType_pe ramp;
+ am_CustomRampType_t ramp;
/**
* the time for the ramp
*/
am_time_t time;
am_Volumes_s() = default;
- am_Volumes_s(const am_VolumeType_e& volumeType, const am_DataType_u& volumeID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time);
+ am_Volumes_s(const am_VolumeType_e& volumeType, const am_DataType_u& volumeID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -890,7 +879,7 @@ namespace am {
}
};
typedef std::vector<am_Volumes_s> am_Volumes_L;
- typedef std::vector<am_ConnectionFormat_pe> am_ConnectionFormat_L;
+ typedef std::vector<am_CustomConnectionFormat_t> am_ConnectionFormat_L;
typedef bool am_bool_t;
typedef std::vector<am_bool_t> am_Convertion_L;
/**
@@ -1389,7 +1378,7 @@ namespace am {
/**
* This defines the notification type
*/
- am_NotificationType_pe type;
+ am_CustomNotificationType_t type;
/**
* This is finally the value of the notification. It's meaning depends on the
* notificationType
@@ -1397,7 +1386,7 @@ namespace am {
int16_t value;
am_NotificationPayload_s() = default;
- am_NotificationPayload_s(const am_NotificationType_pe& type, const int16_t& value);
+ am_NotificationPayload_s(const am_CustomNotificationType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -1783,10 +1772,10 @@ namespace am {
/**
* the used connectionformat
*/
- am_ConnectionFormat_pe connectionFormat;
+ am_CustomConnectionFormat_t connectionFormat;
am_Connection_s() = default;
- am_Connection_s(const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_timeSync_t& delay, const am_ConnectionFormat_pe& connectionFormat);
+ am_Connection_s(const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_timeSync_t& delay, const am_CustomConnectionFormat_t& connectionFormat);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -2107,6 +2096,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_Availability_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Availability_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2127,6 +2117,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_HotSink_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_HotSink_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2147,6 +2138,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_ConnectionState_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_ConnectionState_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2167,6 +2159,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_DomainState_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_DomainState_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2187,6 +2180,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_EarlyDataType_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_EarlyDataType_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2207,6 +2201,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_Error_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Error_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2227,6 +2222,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_MuteState_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_MuteState_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2247,6 +2243,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_InterruptState_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_InterruptState_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2267,6 +2264,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_VolumeType_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_VolumeType_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2287,6 +2285,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_NotificationStatus_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_NotificationStatus_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2307,6 +2306,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_Handle_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Handle_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2327,6 +2327,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_SourceState_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_SourceState_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
@@ -2347,6 +2348,7 @@ namespace CommonAPI {
template<>
struct InputStreamVectorHelper<org::genivi::am::am_RoutingReady_e> {
static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_RoutingReady_e>& vectorValue) {
+ (void)vectorValue;
inputStream.beginReadInt32EnumVector();
}
};
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
index 613cfdb..eb103e5 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -31,6 +20,7 @@ There are two rules that have to be kept in mind
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -72,7 +62,7 @@ namespace CommonAPI {
namespace std {
//hashes for types
-
+
//hashes for error types
}
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
index 7b0969d..e147744 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -46,7 +35,7 @@ __attribute__((constructor)) void registerCommandControlDBusProxy(void) {
CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(CommandControl::getInterfaceId(),
&createCommandControlDBusProxy);
}
-
+
CommandControlDBusProxy::CommandControlDBusProxy(
const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
const std::string& commonApiAddress,
@@ -163,7 +152,7 @@ void CommandControlDBusProxy::connect(const am_sourceID_t& sourceID, const am_si
*this,
"connect",
"qq",
- sourceID, sinkID,
+ sourceID, sinkID,
callStatus
, mainConnectionID, error);
}
@@ -187,7 +176,7 @@ void CommandControlDBusProxy::disconnect(const am_mainConnectionID_t& mainConnec
*this,
"disconnect",
"q",
- mainConnectionID,
+ mainConnectionID,
callStatus
, error);
}
@@ -211,7 +200,7 @@ void CommandControlDBusProxy::setVolume(const am_sinkID_t& sinkID, const am_main
*this,
"setVolume",
"qn",
- sinkID, volume,
+ sinkID, volume,
callStatus
, error);
}
@@ -236,7 +225,7 @@ void CommandControlDBusProxy::volumeStep(const am_sinkID_t& sinkID, const int16_
*this,
"volumeStep",
"qn",
- sinkID, volumeStep_,
+ sinkID, volumeStep_,
callStatus
, error);
}
@@ -260,7 +249,7 @@ void CommandControlDBusProxy::setSinkMuteState(const am_sinkID_t& sinkID, const
*this,
"setSinkMuteState",
"qi",
- sinkID, muteState,
+ sinkID, muteState,
callStatus
, error);
}
@@ -286,7 +275,7 @@ void CommandControlDBusProxy::setMainSinkSoundProperty(const am_sinkID_t& sinkID
*this,
"setMainSinkSoundProperty",
"q(qn)",
- sinkID, soundProperty,
+ sinkID, soundProperty,
callStatus
, error);
}
@@ -312,7 +301,7 @@ void CommandControlDBusProxy::setMainSourceSoundProperty(const am_sourceID_t& so
*this,
"setMainSourceSoundProperty",
"q(qn)",
- sourceID, soundProperty,
+ sourceID, soundProperty,
callStatus
, error);
}
@@ -336,7 +325,7 @@ void CommandControlDBusProxy::setSystemProperty(const am_SystemProperty_s& prope
*this,
"setSystemProperty",
"(qn)",
- property,
+ property,
callStatus
, error);
}
@@ -427,7 +416,7 @@ void CommandControlDBusProxy::getListMainSinkSoundProperties(const am_sinkID_t&
*this,
"getListMainSinkSoundProperties",
"q",
- sinkID,
+ sinkID,
callStatus
, listSoundProperties, error);
}
@@ -451,7 +440,7 @@ void CommandControlDBusProxy::getListMainSourceSoundProperties(const am_sourceID
*this,
"getListMainSourceSoundProperties",
"q",
- sourceID,
+ sourceID,
callStatus
, listSourceProperties, error);
}
@@ -542,7 +531,7 @@ void CommandControlDBusProxy::getTimingInformation(const am_mainConnectionID_t&
*this,
"getTimingInformation",
"q",
- mainConnectionID,
+ mainConnectionID,
callStatus
, delay, error);
}
@@ -565,7 +554,7 @@ void CommandControlDBusProxy::getListMainSinkNotificationConfigurations(const am
*this,
"getListMainSinkNotificationConfigurations",
"q",
- sinkID,
+ sinkID,
callStatus
, listMainNotificationConfigurations, error);
}
@@ -588,7 +577,7 @@ void CommandControlDBusProxy::getListMainSourceNotificationConfigurations(const
*this,
"getListMainSourceNotificationConfigurations",
"q",
- sourceID,
+ sourceID,
callStatus
, listMainNotificationConfigurations, error);
}
@@ -613,7 +602,7 @@ void CommandControlDBusProxy::setMainSinkNotificationConfiguration(const am_sink
*this,
"setMainSinkNotificationConfiguration",
"q(qin)",
- sinkID, mainNotificationConfiguration,
+ sinkID, mainNotificationConfiguration,
callStatus
, error);
}
@@ -638,7 +627,7 @@ void CommandControlDBusProxy::setMainSourceNotificationConfiguration(const am_so
*this,
"setMainSourceNotificationConfiguration",
"q(qin)",
- sourceID, mainNotificationConfiguration,
+ sourceID, mainNotificationConfiguration,
callStatus
, error);
}
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
index e75bc5b..64091a7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -238,7 +227,7 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p
*/
virtual void setMainSourceNotificationConfiguration(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration, CommonAPI::CallStatus& callStatus, am_Error_e& error);
virtual std::future<CommonAPI::CallStatus> setMainSourceNotificationConfigurationAsync(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration, SetMainSourceNotificationConfigurationAsyncCallback callback);
-
+
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
@@ -267,7 +256,7 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p
CommonAPI::DBus::DBusEvent<SourceNotificationEvent> sourceNotification_;
CommonAPI::DBus::DBusEvent<MainSinkNotificationConfigurationChangedEvent> mainSinkNotificationConfigurationChanged_;
CommonAPI::DBus::DBusEvent<MainSourceNotificationConfigurationChangedEvent> mainSourceNotificationConfigurationChanged_;
-
+
};
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
index 16e1d4d..db01c28 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
#include "CommandControlDBusStubAdapter.h"
#include <org/genivi/am/CommandControl.h>
@@ -41,31 +30,21 @@ __attribute__((constructor)) void registerCommandControlDBusStubAdapter(void) {
&createCommandControlDBusStubAdapter);
}
-CommandControlDBusStubAdapter::CommandControlDBusStubAdapter(
- const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
- 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):
- CommandControlDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath,
- dbusConnection, std::dynamic_pointer_cast<CommandControlStub>(stub),
- NULL)
- {
-}
-CommandControlDBusStubAdapter::~CommandControlDBusStubAdapter() {
+
+CommandControlDBusStubAdapterInternal::~CommandControlDBusStubAdapterInternal() {
deactivateManagedInstances();
- deinit();
- stub_.reset();
+ CommandControlDBusStubAdapterHelper::deinit();
}
-void CommandControlDBusStubAdapter::deactivateManagedInstances() {
+void CommandControlDBusStubAdapterInternal::deactivateManagedInstances() {
}
-const char* CommandControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
- static const char* introspectionData =
+const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+ static const std::string introspectionData =
+ "<method name=\"getInterfaceVersion\">\n"
+ "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+ "</method>\n"
/**
* Callback that is called when the number of connections change
*/
@@ -428,10 +407,15 @@ const char* CommandControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData()
"<arg name=\"mainNotificationConfiguration\" type=\"(qin)\" direction=\"in\" />\n"
"<arg name=\"error\" type=\"i\" direction=\"out\" />\n"
"</method>\n"
+
;
- return introspectionData;
+ return introspectionData.c_str();
}
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ CommandControlStub,
+ CommonAPI::Version
+ > getCommandControlInterfaceVersionStubDispatcher(&CommandControlStub::getInterfaceVersion, "uu");
/**
@@ -656,7 +640,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
/**
* Callback that is called when the number of connections change
*/
-void CommandControlDBusStubAdapter::fireNewMainConnectionEvent(const am_MainConnectionType_s& mainConnection) {
+void CommandControlDBusStubAdapterInternal::fireNewMainConnectionEvent(const am_MainConnectionType_s& mainConnection) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_MainConnectionType_s>>
::sendSignal(
*this,
@@ -668,7 +652,7 @@ void CommandControlDBusStubAdapter::fireNewMainConnectionEvent(const am_MainConn
/**
* Callback that is called when the number of connections change
*/
-void CommandControlDBusStubAdapter::fireRemovedMainConnectionEvent(const am_mainConnectionID_t& mainConnection) {
+void CommandControlDBusStubAdapterInternal::fireRemovedMainConnectionEvent(const am_mainConnectionID_t& mainConnection) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_mainConnectionID_t>>
::sendSignal(
*this,
@@ -680,7 +664,7 @@ void CommandControlDBusStubAdapter::fireRemovedMainConnectionEvent(const am_main
/**
* Callback that is called when the number of sinks change
*/
-void CommandControlDBusStubAdapter::fireNewSinkEvent(const am_SinkType_s& sink) {
+void CommandControlDBusStubAdapterInternal::fireNewSinkEvent(const am_SinkType_s& sink) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_SinkType_s>>
::sendSignal(
*this,
@@ -692,7 +676,7 @@ void CommandControlDBusStubAdapter::fireNewSinkEvent(const am_SinkType_s& sink)
/**
* Callback that is called when the number of sinks change
*/
-void CommandControlDBusStubAdapter::fireRemovedSinkEvent(const am_sinkID_t& sinkID) {
+void CommandControlDBusStubAdapterInternal::fireRemovedSinkEvent(const am_sinkID_t& sinkID) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t>>
::sendSignal(
*this,
@@ -704,7 +688,7 @@ void CommandControlDBusStubAdapter::fireRemovedSinkEvent(const am_sinkID_t& sink
/**
* Callback that is called when the number of sources change
*/
-void CommandControlDBusStubAdapter::fireNewSourceEvent(const am_SourceType_s& source) {
+void CommandControlDBusStubAdapterInternal::fireNewSourceEvent(const am_SourceType_s& source) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_SourceType_s>>
::sendSignal(
*this,
@@ -716,7 +700,7 @@ void CommandControlDBusStubAdapter::fireNewSourceEvent(const am_SourceType_s& so
/**
* Callback that is called when the number of sources change
*/
-void CommandControlDBusStubAdapter::fireRemovedSourceEvent(const am_sourceID_t& source) {
+void CommandControlDBusStubAdapterInternal::fireRemovedSourceEvent(const am_sourceID_t& source) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t>>
::sendSignal(
*this,
@@ -728,7 +712,7 @@ void CommandControlDBusStubAdapter::fireRemovedSourceEvent(const am_sourceID_t&
/**
* this callback is fired if the number of sink classes changed
*/
-void CommandControlDBusStubAdapter::fireNumberOfSinkClassesChangedEvent() {
+void CommandControlDBusStubAdapterInternal::fireNumberOfSinkClassesChangedEvent() {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<>>
::sendSignal(
*this,
@@ -739,7 +723,7 @@ void CommandControlDBusStubAdapter::fireNumberOfSinkClassesChangedEvent() {
/**
* this callback is fired if the number of source classes changed
*/
-void CommandControlDBusStubAdapter::fireNumberOfSourceClassesChangedEvent() {
+void CommandControlDBusStubAdapterInternal::fireNumberOfSourceClassesChangedEvent() {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<>>
::sendSignal(
*this,
@@ -750,7 +734,7 @@ void CommandControlDBusStubAdapter::fireNumberOfSourceClassesChangedEvent() {
/**
* This callback is called when the ConnectionState of a connection changed.
*/
-void CommandControlDBusStubAdapter::fireMainConnectionStateChangedEvent(const am_mainConnectionID_t& connectionID, const am_ConnectionState_e& connectionState) {
+void CommandControlDBusStubAdapterInternal::fireMainConnectionStateChangedEvent(const am_mainConnectionID_t& connectionID, const am_ConnectionState_e& connectionState) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_mainConnectionID_t, am_ConnectionState_e>>
::sendSignal(
*this,
@@ -762,7 +746,7 @@ void CommandControlDBusStubAdapter::fireMainConnectionStateChangedEvent(const am
/**
* this callback indicates that a sinkSoundProperty has changed.
*/
-void CommandControlDBusStubAdapter::fireMainSinkSoundPropertyChangedEvent(const am_sinkID_t& sinkID, const am_MainSoundProperty_s& soundProperty) {
+void CommandControlDBusStubAdapterInternal::fireMainSinkSoundPropertyChangedEvent(const am_sinkID_t& sinkID, const am_MainSoundProperty_s& soundProperty) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_MainSoundProperty_s>>
::sendSignal(
*this,
@@ -774,7 +758,7 @@ void CommandControlDBusStubAdapter::fireMainSinkSoundPropertyChangedEvent(const
/**
* this callback indicates that a sourceSoundProperty has changed.
*/
-void CommandControlDBusStubAdapter::fireMainSourceSoundPropertyChangedEvent(const am_sourceID_t& sourceID, const am_MainSoundProperty_s& soundProperty) {
+void CommandControlDBusStubAdapterInternal::fireMainSourceSoundPropertyChangedEvent(const am_sourceID_t& sourceID, const am_MainSoundProperty_s& soundProperty) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_MainSoundProperty_s>>
::sendSignal(
*this,
@@ -786,7 +770,7 @@ void CommandControlDBusStubAdapter::fireMainSourceSoundPropertyChangedEvent(cons
/**
* this callback is called when the availability of a sink has changed
*/
-void CommandControlDBusStubAdapter::fireSinkAvailabilityChangedEvent(const am_sinkID_t& sinkID, const am_Availability_s& availability) {
+void CommandControlDBusStubAdapterInternal::fireSinkAvailabilityChangedEvent(const am_sinkID_t& sinkID, const am_Availability_s& availability) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_Availability_s>>
::sendSignal(
*this,
@@ -798,7 +782,7 @@ void CommandControlDBusStubAdapter::fireSinkAvailabilityChangedEvent(const am_si
/**
* this callback is called when the availability of source has changed.
*/
-void CommandControlDBusStubAdapter::fireSourceAvailabilityChangedEvent(const am_sourceID_t& sourceID, const am_Availability_s& availability) {
+void CommandControlDBusStubAdapterInternal::fireSourceAvailabilityChangedEvent(const am_sourceID_t& sourceID, const am_Availability_s& availability) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_Availability_s>>
::sendSignal(
*this,
@@ -810,7 +794,7 @@ void CommandControlDBusStubAdapter::fireSourceAvailabilityChangedEvent(const am_
/**
* this callback indicates a volume change on the indicated sink
*/
-void CommandControlDBusStubAdapter::fireVolumeChangedEvent(const am_sinkID_t& sinkID, const am_mainVolume_t& volume) {
+void CommandControlDBusStubAdapterInternal::fireVolumeChangedEvent(const am_sinkID_t& sinkID, const am_mainVolume_t& volume) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_mainVolume_t>>
::sendSignal(
*this,
@@ -822,7 +806,7 @@ void CommandControlDBusStubAdapter::fireVolumeChangedEvent(const am_sinkID_t& si
/**
* this callback indicates a mute state change on a sink.
*/
-void CommandControlDBusStubAdapter::fireSinkMuteStateChangedEvent(const am_sinkID_t& sinkID, const am_MuteState_e& muteState) {
+void CommandControlDBusStubAdapterInternal::fireSinkMuteStateChangedEvent(const am_sinkID_t& sinkID, const am_MuteState_e& muteState) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_MuteState_e>>
::sendSignal(
*this,
@@ -834,7 +818,7 @@ void CommandControlDBusStubAdapter::fireSinkMuteStateChangedEvent(const am_sinkI
/**
* is fired if a systemProperty changed
*/
-void CommandControlDBusStubAdapter::fireSystemPropertyChangedEvent(const am_SystemProperty_s& systemProperty) {
+void CommandControlDBusStubAdapterInternal::fireSystemPropertyChangedEvent(const am_SystemProperty_s& systemProperty) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_SystemProperty_s>>
::sendSignal(
*this,
@@ -846,7 +830,7 @@ void CommandControlDBusStubAdapter::fireSystemPropertyChangedEvent(const am_Syst
/**
* This callback is fired if the timinginformation for a mainConnectionID changed
*/
-void CommandControlDBusStubAdapter::fireTimingInformationChangedEvent(const am_mainConnectionID_t& mainConnectionID, const am_timeSync_t& time) {
+void CommandControlDBusStubAdapterInternal::fireTimingInformationChangedEvent(const am_mainConnectionID_t& mainConnectionID, const am_timeSync_t& time) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_mainConnectionID_t, am_timeSync_t>>
::sendSignal(
*this,
@@ -858,7 +842,7 @@ void CommandControlDBusStubAdapter::fireTimingInformationChangedEvent(const am_m
/**
* This callback is called when a sink is updated.
*/
-void CommandControlDBusStubAdapter::fireSinkUpdatedEvent(const am_sinkID_t& sinkID, const am_sinkClass_t& sinkClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
+void CommandControlDBusStubAdapterInternal::fireSinkUpdatedEvent(const am_sinkID_t& sinkID, const am_sinkClass_t& sinkClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_sinkClass_t, am_MainSoundProperty_L>>
::sendSignal(
*this,
@@ -870,7 +854,7 @@ void CommandControlDBusStubAdapter::fireSinkUpdatedEvent(const am_sinkID_t& sink
/**
* This callback is called when a source is updated.
*/
-void CommandControlDBusStubAdapter::fireSourceUpdatedEvent(const am_sourceID_t& sourceID, const am_sourceClass_t& sourceClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
+void CommandControlDBusStubAdapterInternal::fireSourceUpdatedEvent(const am_sourceID_t& sourceID, const am_sourceClass_t& sourceClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_sourceClass_t, am_MainSoundProperty_L>>
::sendSignal(
*this,
@@ -882,7 +866,7 @@ void CommandControlDBusStubAdapter::fireSourceUpdatedEvent(const am_sourceID_t&
/**
* This callback is called when a notificated value of a sink changes.
*/
-void CommandControlDBusStubAdapter::fireSinkNotificationEvent(const am_sinkID_t& sinkID, const am_NotificationPayload_s& notification) {
+void CommandControlDBusStubAdapterInternal::fireSinkNotificationEvent(const am_sinkID_t& sinkID, const am_NotificationPayload_s& notification) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_NotificationPayload_s>>
::sendSignal(
*this,
@@ -894,7 +878,7 @@ void CommandControlDBusStubAdapter::fireSinkNotificationEvent(const am_sinkID_t&
/**
* This callback is called when a notifcated value of a source changes.
*/
-void CommandControlDBusStubAdapter::fireSourceNotificationEvent(const am_sourceID_t& sourceID, const am_NotificationPayload_s& notification) {
+void CommandControlDBusStubAdapterInternal::fireSourceNotificationEvent(const am_sourceID_t& sourceID, const am_NotificationPayload_s& notification) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_NotificationPayload_s>>
::sendSignal(
*this,
@@ -906,7 +890,7 @@ void CommandControlDBusStubAdapter::fireSourceNotificationEvent(const am_sourceI
/**
* This callback is triggered when a mainNotificationConfiguration is changed.
*/
-void CommandControlDBusStubAdapter::fireMainSinkNotificationConfigurationChangedEvent(const am_sinkID_t& sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
+void CommandControlDBusStubAdapterInternal::fireMainSinkNotificationConfigurationChangedEvent(const am_sinkID_t& sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_NotificationConfiguration_s>>
::sendSignal(
*this,
@@ -918,7 +902,7 @@ void CommandControlDBusStubAdapter::fireMainSinkNotificationConfigurationChanged
/**
* This callback is triggered when a mainNotificationConfiguration is changed.
*/
-void CommandControlDBusStubAdapter::fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
+void CommandControlDBusStubAdapterInternal::fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_NotificationConfiguration_s>>
::sendSignal(
*this,
@@ -928,8 +912,37 @@ void CommandControlDBusStubAdapter::fireMainSourceNotificationConfigurationChang
);
}
-const CommandControlDBusStubAdapter::StubDispatcherTable& CommandControlDBusStubAdapter::getStubDispatcherTable() {
- static const CommandControlDBusStubAdapter::StubDispatcherTable stubDispatcherTable = {
+const CommandControlDBusStubAdapterHelper::StubDispatcherTable& CommandControlDBusStubAdapterInternal::getStubDispatcherTable() {
+ return stubDispatcherTable_;
+}
+
+
+CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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):
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ CommandControlDBusStubAdapterHelper(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ std::dynamic_pointer_cast<CommandControlStub>(stub),
+ false),
+ stubDispatcherTable_({
/**
* connects a source to sink
(at)return E_OK on success, E_NOT_POSSIBLE on
@@ -1063,10 +1076,10 @@ const CommandControlDBusStubAdapter::StubDispatcherTable& CommandControlDBusStub
* success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error
*/
{ { "setMainSourceNotificationConfiguration", "q(qin)" }, &org::genivi::am::setMainSourceNotificationConfigurationStubDispatcher }
- };
- return stubDispatcherTable;
-}
+ }) {
+ stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getCommandControlInterfaceVersionStubDispatcher });
+}
} // namespace am
} // namespace genivi
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
index 0580b16..8ef3355 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -48,9 +37,9 @@ namespace am {
typedef CommonAPI::DBus::DBusStubAdapterHelper<CommandControlStub> CommandControlDBusStubAdapterHelper;
-class CommandControlDBusStubAdapter: public CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper {
+class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper {
public:
- CommandControlDBusStubAdapter(
+ CommandControlDBusStubAdapterInternal(
const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
const std::string& commonApiAddress,
const std::string& dbusInterfaceName,
@@ -59,7 +48,7 @@ class CommandControlDBusStubAdapter: public CommandControlStubAdapter, public Co
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
const std::shared_ptr<CommonAPI::StubBase>& stub);
- ~CommandControlDBusStubAdapter();
+ ~CommandControlDBusStubAdapterInternal();
/**
@@ -154,16 +143,46 @@ class CommandControlDBusStubAdapter: public CommandControlStubAdapter, public Co
* This callback is triggered when a mainNotificationConfiguration is changed.
*/
void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration);
-
- const StubDispatcherTable& getStubDispatcherTable();
-
+
+ const CommandControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
void deactivateManagedInstances();
+
protected:
virtual const char* getMethodsDBusIntrospectionXmlData() const;
private:
+ CommandControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class CommandControlDBusStubAdapter: public CommandControlDBusStubAdapterInternal, public std::enable_shared_from_this<CommandControlDBusStubAdapter> {
+public:
+ CommandControlDBusStubAdapter(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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) :
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ CommandControlDBusStubAdapterInternal(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ stub) { }
};
} // namespace am
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
index 90bcd58..656d3f7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -31,6 +20,7 @@ There are two rules that have to be kept in mind
#include "CommandControlProxyBase.h"
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -43,11 +33,15 @@ namespace genivi {
namespace am {
template <typename ... _AttributeExtensions>
-class CommandControlProxy: virtual public CommandControl, virtual public CommandControlProxyBase, public _AttributeExtensions... {
- public:
+class CommandControlProxy: virtual public CommandControl, virtual public CommandControlProxyBase
+, public _AttributeExtensions... {
+public:
CommandControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
~CommandControlProxy();
+ typedef CommandControl InterfaceType;
+
+
/**
* Callback that is called when the number of connections change
@@ -783,7 +777,7 @@ class CommandControlProxy: virtual public CommandControl, virtual public Command
* It will provide the same value for CallStatus as will be handed to the callback.
*/
virtual std::future<CommonAPI::CallStatus> setMainSourceNotificationConfigurationAsync(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration, SetMainSourceNotificationConfigurationAsyncCallback callback);
-
+
/**
* Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -1187,7 +1181,6 @@ CommonAPI::InterfaceVersionAttribute& CommandControlProxy<_AttributeExtensions..
return delegate_->getInterfaceVersionAttribute();
}
-
} // namespace am
} // namespace genivi
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
index 58c3abf..377547a 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
index 9767f67..6e8de18 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -179,10 +168,9 @@ class CommandControlStubAdapter: virtual public CommonAPI::StubAdapter, public C
* Instead, the "fire<broadcastName>Event" methods of the stub should be used.
*/
virtual void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) = 0;
-
-
+
+
virtual void deactivateManagedInstances() = 0;
-
protected:
/**
* Defines properties for storing the ClientIds of clients / proxies that have
@@ -216,9 +204,10 @@ class CommandControlStubRemoteEvent {
* This class and the one above are the ones an application developer needs to have
* a look at if he wants to implement a service.
*/
-class CommandControlStub : public CommonAPI::Stub<CommandControlStubAdapter , CommandControlStubRemoteEvent> {
- public:
+class CommandControlStub : public virtual CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent> {
+public:
virtual ~CommandControlStub() { }
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
/**
@@ -490,7 +479,10 @@ class CommandControlStub : public CommonAPI::Stub<CommandControlStubAdapter , Co
*/
/// Sends a broadcast event for mainSourceNotificationConfigurationChanged.
virtual void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) = 0;
-
+
+ using CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
};
} // namespace am
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
index 7d588c1..f23f2da 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
#include <org/genivi/am/CommandControlStubDefault.h>
@@ -25,11 +14,16 @@ namespace genivi {
namespace am {
CommandControlStubDefault::CommandControlStubDefault():
- remoteEventHandler_(this) {
+ remoteEventHandler_(this),
+ interfaceVersion_(CommandControl::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& CommandControlStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+ return interfaceVersion_;
}
CommandControlStubRemoteEvent* CommandControlStubDefault::initStubAdapter(const std::shared_ptr<CommandControlStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
+ CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::stubAdapter_ = stubAdapter;
return &remoteEventHandler_;
}
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
index ed2dad3..2bfe6ba 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -29,6 +18,7 @@ There are two rules that have to be kept in mind
#ifndef ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_
#define ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_
+
#include <org/genivi/am/CommandControlStub.h>
#include <sstream>
@@ -46,12 +36,14 @@ namespace am {
* that would be defined for this service, and/or if you do not need any non-default
* behaviour.
*/
-class CommandControlStubDefault : public CommandControlStub {
- public:
+class CommandControlStubDefault : public virtual CommandControlStub {
+public:
CommandControlStubDefault();
CommandControlStubRemoteEvent* initStubAdapter(const std::shared_ptr<CommandControlStubAdapter>& stubAdapter);
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
/**
* connects a source to sink
@@ -321,11 +313,10 @@ class CommandControlStubDefault : public CommandControlStub {
* This callback is triggered when a mainNotificationConfiguration is changed.
*/
virtual void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration);
-
- protected:
- std::shared_ptr<CommandControlStubAdapter> stubAdapter_;
- private:
+
+protected:
+private:
class RemoteEventHandler: public CommandControlStubRemoteEvent {
public:
RemoteEventHandler(CommandControlStubDefault* defaultStub);
@@ -337,6 +328,8 @@ class CommandControlStubDefault : public CommandControlStub {
RemoteEventHandler remoteEventHandler_;
+
+ CommonAPI::Version interfaceVersion_;
};
} // namespace am
diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp
index 772b1bd..81e8799 100644
--- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp
+++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp
@@ -222,7 +222,7 @@ void CAmCommandSenderCAPI::cbMainSinkSoundPropertyChanged(const am_sinkID_t sink
RETURN_IF_NOT_READY()
assert((bool)mService);
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbMainSinkSoundPropertyChanged called, sinkID", sinkID, "SoundProperty.type", soundProperty.type, "SoundProperty.value", soundProperty.value);
- org::genivi::am::am_MainSoundProperty_s mainSoundProp(CAmConvert2CAPIType(soundProperty.type), soundProperty.value);
+ org::genivi::am::am_MainSoundProperty_s mainSoundProp(soundProperty.type, soundProperty.value);
mService->fireMainSinkSoundPropertyChangedEvent(sinkID, mainSoundProp);
}
@@ -304,7 +304,7 @@ void CAmCommandSenderCAPI::cbSinkUpdated(const am_sinkID_t sinkID, const am_sink
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbSinkUpdated called, sinkID", sinkID);
org::genivi::am::am_MainSoundProperty_L list;
std::for_each(listMainSoundProperties.begin(), listMainSoundProperties.end(), [&](const am_MainSoundProperty_s & ref) {
- org::genivi::am::am_MainSoundProperty_s prop(CAmConvert2CAPIType(ref.type), ref.value);
+ org::genivi::am::am_MainSoundProperty_s prop(ref.type, ref.value);
list.push_back(prop);
});
mService->fireSinkUpdatedEvent(sinkID, sinkClassID, list);
@@ -317,7 +317,7 @@ void CAmCommandSenderCAPI::cbSourceUpdated(const am_sourceID_t sourceID, const a
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbSourceUpdated called, sourceID", sourceID);
org::genivi::am::am_MainSoundProperty_L list;
std::for_each(listMainSoundProperties.begin(), listMainSoundProperties.end(), [&](const am_MainSoundProperty_s & ref) {
- org::genivi::am::am_MainSoundProperty_s prop(CAmConvert2CAPIType(ref.type), ref.value);
+ org::genivi::am::am_MainSoundProperty_s prop(ref.type, ref.value);
list.push_back(prop);
});
mService->fireSourceUpdatedEvent(sourceID, sourceClassID, list);
@@ -328,7 +328,7 @@ void CAmCommandSenderCAPI::cbSinkNotification(const am_sinkID_t sinkID, const am
RETURN_IF_NOT_READY()
assert((bool)mService);
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbSinkNotification called, sinkID", sinkID);
- org::genivi::am::am_NotificationPayload_s ciNnotif(static_cast<org::genivi::am::am_NotificationType_pe>(notification.type), notification.value);
+ org::genivi::am::am_NotificationPayload_s ciNnotif(notification.type, notification.value);
mService->fireSinkNotificationEvent(sinkID, ciNnotif);
}
@@ -337,7 +337,7 @@ void CAmCommandSenderCAPI::cbSourceNotification(const am_sourceID_t sourceID, co
RETURN_IF_NOT_READY()
assert((bool)mService);
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbSourceNotification called, sourceID", sourceID);
- org::genivi::am::am_NotificationPayload_s ciNnotif(static_cast<org::genivi::am::am_NotificationType_pe>(notification.type), notification.value);
+ org::genivi::am::am_NotificationPayload_s ciNnotif(notification.type, notification.value);
mService->fireSourceNotificationEvent(sourceID, ciNnotif);
}
@@ -346,7 +346,7 @@ void CAmCommandSenderCAPI::cbMainSinkNotificationConfigurationChanged(const am_s
RETURN_IF_NOT_READY()
assert((bool)mService);
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbSinkMainNotificationConfigurationChanged called, sinkID", sinkID);
- org::genivi::am::am_NotificationConfiguration_s ciNotifConfig(static_cast<org::genivi::am::am_NotificationType_pe>(mainNotificationConfiguration.type),
+ org::genivi::am::am_NotificationConfiguration_s ciNotifConfig(mainNotificationConfiguration.type,
static_cast<org::genivi::am::am_NotificationStatus_e>(mainNotificationConfiguration.status),
mainNotificationConfiguration.parameter);
mService->fireMainSinkNotificationConfigurationChangedEvent(sinkID, ciNotifConfig);
@@ -357,7 +357,7 @@ void CAmCommandSenderCAPI::cbMainSourceNotificationConfigurationChanged(const am
RETURN_IF_NOT_READY()
assert((bool)mService);
log(&ctxCommandCAPI, DLT_LOG_INFO, "cbSourceMainNotificationConfigurationChanged called, sourceID", sourceID);
- org::genivi::am::am_NotificationConfiguration_s ciNotifConfig(static_cast<org::genivi::am::am_NotificationType_pe>(mainNotificationConfiguration.type),
+ org::genivi::am::am_NotificationConfiguration_s ciNotifConfig(mainNotificationConfiguration.type,
static_cast<org::genivi::am::am_NotificationStatus_e>(mainNotificationConfiguration.status),
mainNotificationConfiguration.parameter);
mService->fireMainSourceNotificationConfigurationChangedEvent(sourceID, ciNotifConfig);
diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderCommon.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderCommon.cpp
index 58816ce..06383ad 100644
--- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderCommon.cpp
+++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderCommon.cpp
@@ -21,34 +21,24 @@
/**
* Utility functions
*/
-void CAmConvertAvailablility(const am_Availability_s & amAavailability, org::genivi::am::am_Availability_s & result)
+void CAmConvertAvailablility(const am_Availability_s & amAvailability, org::genivi::am::am_Availability_s & result)
{
- result.availability = CAmConvert2CAPIType(amAavailability.availability);
- result.availabilityReason = CAmConvert2CAPIType(amAavailability.availabilityReason);
+ result.availability = CAmConvert2CAPIType(amAvailability.availability);
+ result.availabilityReason = amAvailability.availabilityReason;
}
void CAmConvertMainSoundProperty(const am_MainSoundProperty_s & amMainSoundProperty, org::genivi::am::am_MainSoundProperty_s & result)
{
- result.type = CAmConvert2CAPIType(amMainSoundProperty.type);
+ result.type = amMainSoundProperty.type;
result.value = amMainSoundProperty.value;
}
void CAmConvertSystemProperty(const am_SystemProperty_s & amSystemProperty, org::genivi::am::am_SystemProperty_s & result)
{
- result.type = CAmConvert2CAPIType(amSystemProperty.type);
+ result.type = amSystemProperty.type;
result.value = amSystemProperty.value;
}
-org::genivi::am::am_ClassProperty_pe CAmConvert2CAPIType(const am_ClassProperty_e & property)
-{
- return static_cast<org::genivi::am::am_ClassProperty_pe>(property);
-}
-
-org::genivi::am::am_SystemPropertyType_pe CAmConvert2CAPIType(const am_SystemPropertyType_e & property)
-{
- return static_cast<org::genivi::am::am_SystemPropertyType_pe>(property);
-}
-
org::genivi::am::am_Availability_e CAmConvert2CAPIType(const am_Availability_e & availability)
{
return (A_MAX==availability)?org::genivi::am::am_Availability_e::A_MAX
@@ -56,11 +46,6 @@ org::genivi::am::am_Availability_e CAmConvert2CAPIType(const am_Availability_e &
static_cast<org::genivi::am::am_Availability_e>(availability);
}
-org::genivi::am::am_AvailabilityReason_pe CAmConvert2CAPIType(const am_AvailabilityReason_e & availabilityReason)
-{
- return static_cast<org::genivi::am::am_AvailabilityReason_pe>(availabilityReason);
-}
-
org::genivi::am::am_MuteState_e CAmConvert2CAPIType(const am_MuteState_e & muteState)
{
return MS_MAX==muteState?
@@ -75,15 +60,6 @@ am_MuteState_e CAmConvertFromCAPIType(const org::genivi::am::am_MuteState_e & mu
MS_MAX:static_cast<am_MuteState_e>(muteState);
}
-org::genivi::am::am_MainSoundPropertyType_pe CAmConvert2CAPIType(const am_MainSoundPropertyType_e & type)
-{
- return static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(type);
-}
-am_MainSoundPropertyType_e CAmConvertFromCAPIType(const org::genivi::am::am_MainSoundPropertyType_pe & type)
-{
- return static_cast<am_MainSoundPropertyType_e>(type);
-}
-
org::genivi::am::am_ConnectionState_e CAmConvert2CAPIType(const am_ConnectionState_e & connectionState)
{
return CS_MAX==connectionState?
@@ -97,11 +73,6 @@ am_ConnectionState_e CAmConvertFromCAPIType(const org::genivi::am::am_Connection
CS_MAX:static_cast<am_ConnectionState_e>(connectionState);
}
-org::genivi::am::am_NotificationType_pe CAmConvert2CAPIType(const am_NotificationType_e & notificationType)
-{
- return static_cast<org::genivi::am::am_NotificationType_pe>(notificationType);
-}
-
org::genivi::am::am_NotificationStatus_e CAmConvert2CAPIType(const am_NotificationStatus_e & notificationStatus)
{
return NS_MAX==notificationStatus?
diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp
index 552ff9a..d2d59f1 100644
--- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp
+++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp
@@ -65,19 +65,19 @@ void CAmCommandSenderService::setSinkMuteState(org::genivi::am::am_sinkID_t sink
void CAmCommandSenderService::setMainSinkSoundProperty(org::genivi::am::am_sinkID_t sinkID, org::genivi::am::am_MainSoundProperty_s soundProperty, org::genivi::am::am_Error_e& result) {
assert(mpIAmCommandReceive);
- am_MainSoundProperty_s property = {static_cast<am_MainSoundPropertyType_e>(soundProperty.type), soundProperty.value};
+ am_MainSoundProperty_s property = {static_cast<am_CustomMainSoundPropertyType_t>(soundProperty.type), soundProperty.value};
result = CAmConvert2CAPIType(mpIAmCommandReceive->setMainSinkSoundProperty(property, sinkID));
}
void CAmCommandSenderService::setMainSourceSoundProperty(org::genivi::am::am_sourceID_t sourceID, org::genivi::am::am_MainSoundProperty_s soundProperty, org::genivi::am::am_Error_e& result) {
assert(mpIAmCommandReceive);
- am_MainSoundProperty_s property = {static_cast<am_MainSoundPropertyType_e>(soundProperty.type), soundProperty.value};
+ am_MainSoundProperty_s property = {static_cast<am_CustomMainSoundPropertyType_t>(soundProperty.type), soundProperty.value};
result = CAmConvert2CAPIType(mpIAmCommandReceive->setMainSourceSoundProperty(property, sourceID));
}
void CAmCommandSenderService::setSystemProperty(org::genivi::am::am_SystemProperty_s soundProperty, org::genivi::am::am_Error_e& result) {
assert(mpIAmCommandReceive);
- am_SystemProperty_s property = {static_cast<am_SystemPropertyType_e>(soundProperty.type), soundProperty.value};
+ am_SystemProperty_s property = {static_cast<am_CustomSystemPropertyType_t>(soundProperty.type), soundProperty.value};
result = CAmConvert2CAPIType(mpIAmCommandReceive->setSystemProperty(property));
}
@@ -147,7 +147,7 @@ void CAmCommandSenderService::getListMainSinkSoundProperties(org::genivi::am::am
org::genivi::am::am_MainSoundProperty_s item;
for(std::vector<am_MainSoundProperty_s>::const_iterator iter = list.begin(); iter!=list.end(); iter++)
{
- item.type = CAmConvert2CAPIType(iter->type);
+ item.type = iter->type;
item.value = iter->value;
listSoundProperties.push_back (item);
}
@@ -163,7 +163,7 @@ void CAmCommandSenderService::getListMainSourceSoundProperties(org::genivi::am::
org::genivi::am::am_MainSoundProperty_s item;
for(std::vector<am_MainSoundProperty_s>::const_iterator iter = list.begin(); iter!=list.end(); iter++)
{
- item.type = CAmConvert2CAPIType(iter->type);
+ item.type = iter->type;
item.value = iter->value;
listSourceProperties.push_back (item);
}
@@ -183,7 +183,7 @@ void CAmCommandSenderService::getListSourceClasses(org::genivi::am::am_SourceCla
item.name = iter->name;
item.listClassProperties.clear();
std::for_each(iter->listClassProperties.begin(), iter->listClassProperties.end(), [&](const am_ClassProperty_s & ref) {
- org::genivi::am::am_ClassProperty_s classProp(CAmConvert2CAPIType(ref.classProperty), ref.value);
+ org::genivi::am::am_ClassProperty_s classProp(ref.classProperty, ref.value);
item.listClassProperties.push_back(classProp);
});
listSourceClasses.push_back (item);
@@ -204,7 +204,7 @@ void CAmCommandSenderService::getListSinkClasses(org::genivi::am::am_SinkClass_L
item.name = iter->name;
item.listClassProperties.clear();
std::for_each(iter->listClassProperties.begin(), iter->listClassProperties.end(), [&](const am_ClassProperty_s & ref) {
- org::genivi::am::am_ClassProperty_s classProp(CAmConvert2CAPIType(ref.classProperty), ref.value);
+ org::genivi::am::am_ClassProperty_s classProp(ref.classProperty, ref.value);
item.listClassProperties.push_back(classProp);
});
listSinkClasses.push_back (item);
@@ -221,7 +221,7 @@ void CAmCommandSenderService::getListSystemProperties(org::genivi::am::am_System
org::genivi::am::am_SystemProperty_s item;
for(std::vector<am_SystemProperty_s>::const_iterator iter = list.begin(); iter!=list.end(); iter++)
{
- item.type = CAmConvert2CAPIType(iter->type);
+ item.type = iter->type;
item.value = iter->value;
listSystemProperties.push_back (item);
}
diff --git a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp
index 66bd0dc..f7abcbc 100644
--- a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp
+++ b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp
@@ -313,7 +313,7 @@ TEST_F(CAmCommandSenderCAPITest, SetMainSinkSoundPropertyTest)
EXPECT_CALL(*env->mpCommandReceive, setMainSinkSoundProperty(AllOf(
Field(&am_MainSoundProperty_s::value, 3),
Field(&am_MainSoundProperty_s::type, MSP_UNKNOWN)), sinkID)).WillOnce(Return(E_OK));
- org::genivi::am::am_MainSoundProperty_s value(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(am_MainSoundPropertyType_e::MSP_UNKNOWN), (const int16_t)3);
+ org::genivi::am::am_MainSoundProperty_s value(MSP_UNKNOWN, (const int16_t)3);
env->mProxy->setMainSinkSoundProperty(sinkID, value, callStatus, result);
ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK);
}
@@ -332,7 +332,7 @@ TEST_F(CAmCommandSenderCAPITest, SetMainSourceSoundPropertyTest)
EXPECT_CALL(*env->mpCommandReceive, setMainSourceSoundProperty(AllOf(
Field(&am_MainSoundProperty_s::value, 3),
Field(&am_MainSoundProperty_s::type, MSP_UNKNOWN)), sID)).WillOnce(Return(E_OK));
- org::genivi::am::am_MainSoundProperty_s value(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(am_MainSoundPropertyType_e::MSP_UNKNOWN), (const int16_t)3);
+ org::genivi::am::am_MainSoundProperty_s value(MSP_UNKNOWN, (const int16_t)3);
env->mProxy->setMainSourceSoundProperty(sID, value, callStatus, result);
ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK);
}
@@ -349,7 +349,7 @@ TEST_F(CAmCommandSenderCAPITest, SetSystemPropertyTest)
EXPECT_CALL(*env->mpCommandReceive, setSystemProperty(Field(&am_SystemProperty_s::value, 2))).WillOnce(Return(E_OK));
- org::genivi::am::am_SystemProperty_s value(static_cast<org::genivi::am::am_SystemPropertyType_pe>(am_SystemPropertyType_e::SYP_UNKNOWN), (const int16_t)2);
+ org::genivi::am::am_SystemProperty_s value(SYP_UNKNOWN, (const int16_t)2);
env->mProxy->setSystemProperty(value, callStatus, result);
ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK);
}
@@ -417,7 +417,7 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainSinksTest)
ASSERT_EQ(34, listMainSinks.at(0).sinkClassID);
ASSERT_EQ(24, listMainSinks.at(0).sinkID);
ASSERT_EQ(org::genivi::am::am_Availability_e::A_UNAVAILABLE, listMainSinks.at(0).availability.availability);
- ASSERT_EQ(static_cast<org::genivi::am::am_AvailabilityReason_pe>(am_AvailabilityReason_e::AR_GENIVI_NOMEDIA), listMainSinks.at(0).availability.availabilityReason);
+ ASSERT_EQ(AR_GENIVI_NOMEDIA, listMainSinks.at(0).availability.availabilityReason);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
}
@@ -452,7 +452,7 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainSourcesTest)
ASSERT_EQ(12, list.at(0).sourceClassID);
ASSERT_EQ(224, list.at(0).sourceID);
ASSERT_EQ(org::genivi::am::am_Availability_e::A_MAX, list.at(0).availability.availability);
- ASSERT_EQ(static_cast<org::genivi::am::am_AvailabilityReason_pe>(am_AvailabilityReason_e::AR_GENIVI_SAMEMEDIA), list.at(0).availability.availabilityReason);
+ ASSERT_EQ(AR_GENIVI_SAMEMEDIA, list.at(0).availability.availabilityReason);
ASSERT_EQ(22, list.at(1).sourceID);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
@@ -461,10 +461,10 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainSourcesTest)
ACTION(returnListMainSinkSoundProperties){
std::vector<am_MainSoundProperty_s> list;
am_MainSoundProperty_s listItem;
- listItem.type=MSP_MAX;
+ listItem.type=MSP_UNKNOWN;
listItem.value=223;
list.push_back(listItem);
- listItem.type=MSP_MAX;
+ listItem.type=MSP_GENIVI_BASS;
listItem.value=2;
list.push_back(listItem);
arg1=list;
@@ -485,9 +485,9 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainSinkSoundPropertiesTest)
ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK);
ASSERT_EQ(2, list.size());
ASSERT_EQ(223, list.at(0).value);
- ASSERT_EQ(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(am_MainSoundPropertyType_e::MSP_MAX), list.at(0).type);
+ ASSERT_EQ(MSP_UNKNOWN, list.at(0).type);
ASSERT_EQ(2, list.at(1).value);
- ASSERT_EQ(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(am_MainSoundPropertyType_e::MSP_MAX), list.at(1).type);
+ ASSERT_EQ(MSP_GENIVI_BASS, list.at(1).type);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
}
@@ -495,10 +495,10 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainSinkSoundPropertiesTest)
ACTION(returnListMainSourceSoundProperties){
std::vector<am_MainSoundProperty_s> list;
am_MainSoundProperty_s listItem;
- listItem.type=MSP_EXAMPLE_MID;
+ listItem.type=MSP_GENIVI_MID;
listItem.value=223;
list.push_back(listItem);
- listItem.type=MSP_MAX;
+ listItem.type=MSP_GENIVI_BASS;
listItem.value=2;
list.push_back(listItem);
arg1=list;
@@ -519,9 +519,9 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainSourceSoundPropertiesTest)
ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK);
ASSERT_EQ(2, list.size());
ASSERT_EQ(223, list.at(0).value);
- ASSERT_EQ(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(am_MainSoundPropertyType_e::MSP_EXAMPLE_MID), list.at(0).type);
+ ASSERT_EQ(MSP_GENIVI_MID, list.at(0).type);
ASSERT_EQ(2, list.at(1).value);
- ASSERT_EQ(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(am_MainSoundPropertyType_e::MSP_MAX), list.at(1).type);
+ ASSERT_EQ(MSP_GENIVI_BASS, list.at(1).type);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
}
@@ -530,7 +530,7 @@ ACTION(returnListSourceClasses){
std::vector<am_SourceClass_s> list;
am_SourceClass_s listItem;
am_ClassProperty_s property;
- property.classProperty=CP_MAX;
+ property.classProperty=CP_UNKNOWN;
property.value=12;
listItem.name="FirstCLass";
listItem.sourceClassID=23;
@@ -559,11 +559,11 @@ TEST_F(CAmCommandSenderCAPITest, GetListSourceClassesTest)
ASSERT_EQ(23, list.at(0).sourceClassID);
ASSERT_EQ(1, list.at(0).listClassProperties.size());
- ASSERT_EQ(static_cast<org::genivi::am::am_ClassProperty_pe>(am_ClassProperty_e::CP_MAX), list.at(0).listClassProperties.at(0).classProperty);
+ ASSERT_EQ(CP_UNKNOWN, list.at(0).listClassProperties.at(0).classProperty);
ASSERT_EQ(2, list.at(1).sourceClassID);
ASSERT_EQ(2, list.at(1).listClassProperties.size());
- ASSERT_EQ(static_cast<org::genivi::am::am_ClassProperty_pe>(am_ClassProperty_e::CP_MAX), list.at(1).listClassProperties.at(0).classProperty);
+ ASSERT_EQ(CP_UNKNOWN, list.at(1).listClassProperties.at(0).classProperty);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
}
@@ -572,7 +572,7 @@ ACTION(returnListSinkClasses){
std::vector<am_SinkClass_s> list;
am_SinkClass_s listItem;
am_ClassProperty_s property;
- property.classProperty=CP_MAX;
+ property.classProperty=CP_UNKNOWN;
property.value=122;
listItem.name="FirstCLass";
listItem.sinkClassID=23;
@@ -602,12 +602,12 @@ TEST_F(CAmCommandSenderCAPITest, GetListSinkClassesTest)
ASSERT_EQ(0, list.at(0).name.compare("FirstCLass"));
ASSERT_EQ(23, list.at(0).sinkClassID);
ASSERT_EQ(1, list.at(0).listClassProperties.size());
- ASSERT_EQ(static_cast<org::genivi::am::am_ClassProperty_pe>(am_ClassProperty_e::CP_MAX), list.at(0).listClassProperties.at(0).classProperty);
+ ASSERT_EQ(CP_UNKNOWN, list.at(0).listClassProperties.at(0).classProperty);
ASSERT_EQ(0, list.at(1).name.compare("SecondCLass"));
ASSERT_EQ(2, list.at(1).sinkClassID);
ASSERT_EQ(2, list.at(1).listClassProperties.size());
- ASSERT_EQ(static_cast<org::genivi::am::am_ClassProperty_pe>(am_ClassProperty_e::CP_MAX), list.at(1).listClassProperties.at(0).classProperty);
+ ASSERT_EQ(CP_UNKNOWN, list.at(1).listClassProperties.at(0).classProperty);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
}
@@ -615,7 +615,7 @@ TEST_F(CAmCommandSenderCAPITest, GetListSinkClassesTest)
ACTION(returnListSystemProperties){
std::vector<am_SystemProperty_s> list;
am_SystemProperty_s listItem;
- listItem.type=SYP_MAX;
+ listItem.type=SYP_UNKNOWN;
listItem.value=-2245;
list.push_back(listItem);
arg0=list;
@@ -636,7 +636,7 @@ TEST_F(CAmCommandSenderCAPITest, GetListSystemPropertiesTest)
ASSERT_EQ(1, list.size());
ASSERT_EQ(-2245, list.at(0).value);
- ASSERT_EQ(static_cast<org::genivi::am::am_ClassProperty_pe>(am_SystemPropertyType_e::SYP_MAX), list.at(0).type);
+ ASSERT_EQ(SYP_UNKNOWN, list.at(0).type);
}
EXPECT_TRUE(Mock::VerifyAndClearExpectations(env->mpCommandReceive));
}
@@ -735,14 +735,14 @@ TEST_F(CAmCommandSenderCAPITest, onSourceAddedEventTest)
destination.sourceID = 100;
destination.name = "Name";
destination.availability.availability = org::genivi::am::am_Availability_e::A_MAX;
- destination.availability.availabilityReason = static_cast<org::genivi::am::am_AvailabilityReason_pe>(AR_MAX);
+ destination.availability.availabilityReason = AR_UNKNOWN;
destination.sourceClassID = 200;
am_SourceType_s origin;
origin.sourceID = 100;
origin.name = "Name";
origin.availability.availability = A_MAX;
- origin.availability.availabilityReason = AR_MAX;
+ origin.availability.availabilityReason = AR_UNKNOWN;
origin.sourceClassID = 200;
EXPECT_CALL(mock, onSourceAddedEvent(destination));
env->mpPlugin->cbNewSource(origin);
@@ -780,9 +780,9 @@ TEST_F(CAmCommandSenderCAPITest, onMainSourceSoundPropertyChangedEventTest)
am_MainSoundProperty_s soundProperty;
soundProperty.value = 10;
- soundProperty.type = am_MainSoundPropertyType_e::MSP_MAX;
+ soundProperty.type = MSP_UNKNOWN;
- org::genivi::am::am_MainSoundProperty_s destination(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(MSP_MAX), 10);
+ org::genivi::am::am_MainSoundProperty_s destination(MSP_UNKNOWN, 10);
EXPECT_CALL(mock, onMainSourceSoundPropertyChangedEvent(101, destination));
env->mpPlugin->cbMainSourceSoundPropertyChanged(101, soundProperty);
@@ -803,9 +803,9 @@ TEST_F(CAmCommandSenderCAPITest, onSourceAvailabilityChangedEventTest)
am_Availability_s availability;
availability.availability = A_MAX;
- availability.availabilityReason = AR_MAX;
+ availability.availabilityReason = AR_UNKNOWN;
- org::genivi::am::am_Availability_s destination(org::genivi::am::am_Availability_e::A_MAX, static_cast<org::genivi::am::am_AvailabilityReason_pe>(AR_MAX));
+ org::genivi::am::am_Availability_s destination(org::genivi::am::am_Availability_e::A_MAX, AR_UNKNOWN);
EXPECT_CALL(mock, onSourceAvailabilityChangedEvent(101, destination));
env->mpPlugin->cbSourceAvailabilityChanged(101, availability);
@@ -842,7 +842,7 @@ TEST_F(CAmCommandSenderCAPITest, onSinkAddedEventTest)
destination.sinkID = 100;
destination.name = "Name";
destination.availability.availability = org::genivi::am::am_Availability_e::A_MAX;
- destination.availability.availabilityReason = static_cast<org::genivi::am::am_AvailabilityReason_pe>(AR_MAX);
+ destination.availability.availabilityReason = AR_UNKNOWN;
destination.muteState = org::genivi::am::am_MuteState_e::MS_MAX;
destination.volume = 1;
destination.sinkClassID = 100;
@@ -851,7 +851,7 @@ TEST_F(CAmCommandSenderCAPITest, onSinkAddedEventTest)
origin.sinkID = 100;
origin.name = "Name";
origin.availability.availability = A_MAX;
- origin.availability.availabilityReason = AR_MAX;
+ origin.availability.availabilityReason = AR_UNKNOWN;
origin.muteState = am_MuteState_e::MS_MAX;
origin.volume = 1;
origin.sinkClassID = 100;
@@ -891,9 +891,9 @@ TEST_F(CAmCommandSenderCAPITest, onMainSinkSoundPropertyChangedEventTest)
am_MainSoundProperty_s soundProperty;
soundProperty.value = 10;
- soundProperty.type = am_MainSoundPropertyType_e::MSP_MAX;
+ soundProperty.type = MSP_UNKNOWN;
- org::genivi::am::am_MainSoundProperty_s destination(static_cast<org::genivi::am::am_MainSoundPropertyType_pe>(MSP_MAX), 10);
+ org::genivi::am::am_MainSoundProperty_s destination(MSP_UNKNOWN, 10);
EXPECT_CALL(mock, onMainSinkSoundPropertyChangedEvent(101, destination));
env->mpPlugin->cbMainSinkSoundPropertyChanged(101, soundProperty);
@@ -914,9 +914,9 @@ TEST_F(CAmCommandSenderCAPITest, onSinkAvailabilityChangedEventTest)
am_Availability_s availability;
availability.availability = A_MAX;
- availability.availabilityReason = AR_MAX;
+ availability.availabilityReason = AR_UNKNOWN;
- org::genivi::am::am_Availability_s destination(org::genivi::am::am_Availability_e::A_MAX, static_cast<org::genivi::am::am_AvailabilityReason_pe>(AR_MAX));
+ org::genivi::am::am_Availability_s destination(org::genivi::am::am_Availability_e::A_MAX, AR_UNKNOWN);
EXPECT_CALL(mock, onSinkAvailabilityChangedEvent(101, destination));
env->mpPlugin->cbSinkAvailabilityChanged(101, availability);
@@ -967,10 +967,10 @@ TEST_F(CAmCommandSenderCAPITest, onSystemPropertyChangedEventTest)
auto subscription = env->mProxy->getSystemPropertyChangedEvent().subscribe(std::bind(&MockNotificationsClient::onSystemPropertyChangedEvent, std::ref(mock),
std::placeholders::_1));
- org::genivi::am::am_SystemProperty_s value(static_cast<org::genivi::am::am_SystemPropertyType_pe>(SYP_UNKNOWN), (const int16_t)2);
+ org::genivi::am::am_SystemProperty_s value(static_cast<org::genivi::am::am_CustomSystemPropertyType_t>(SYP_UNKNOWN), (const int16_t)2);
am_SystemProperty_s systemProperty;
systemProperty.value = 2;
- systemProperty.type = am_SystemPropertyType_e::SYP_UNKNOWN;
+ systemProperty.type = SYP_UNKNOWN;
EXPECT_CALL(mock, onSystemPropertyChangedEvent(value));
env->mpPlugin->cbSystemPropertyChanged(systemProperty);
@@ -1008,7 +1008,7 @@ TEST_F(CAmCommandSenderCAPITest, onSinkUpdatedEventTest)
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
am_MainSoundProperty_s prop;
prop.value = 1;
- prop.type = am_MainSoundPropertyType_e::MSP_MAX;
+ prop.type = MSP_UNKNOWN;
listMainSoundProperties.push_back(prop);
EXPECT_CALL(mock, onSinkUpdatedEvent(1, 2, _));
env->mpPlugin->cbSinkUpdated(1, 2, listMainSoundProperties);
@@ -1029,7 +1029,7 @@ TEST_F(CAmCommandSenderCAPITest, onSourceUpdatedTest)
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
am_MainSoundProperty_s prop;
prop.value = 1;
- prop.type = am_MainSoundPropertyType_e::MSP_MAX;
+ prop.type = MSP_UNKNOWN;
listMainSoundProperties.push_back(prop);
EXPECT_CALL(mock, onSourceUpdatedEvent(1, 2, _));
env->mpPlugin->cbSourceUpdated(1, 2, listMainSoundProperties);
@@ -1048,10 +1048,10 @@ TEST_F(CAmCommandSenderCAPITest, onSinkNotificationEventTest)
auto subscription = env->mProxy->getSinkNotificationEvent().subscribe(std::bind(&MockNotificationsClient::onSinkNotificationEvent, std::ref(mock),
std::placeholders::_1, std::placeholders::_2));
am_NotificationPayload_s orig;
- orig.type = am_NotificationType_e::NT_MAX;
+ orig.type = NT_UNKNOWN;
orig.value = 1;
org::genivi::am::am_NotificationPayload_s dest;
- dest.type = static_cast<org::genivi::am::am_NotificationType_pe>(NT_MAX);
+ dest.type = NT_UNKNOWN;
dest.value = 1;
EXPECT_CALL(mock, onSinkNotificationEvent(1, dest));
@@ -1072,10 +1072,10 @@ TEST_F(CAmCommandSenderCAPITest, onSourceNotificationEventTest)
auto subscription = env->mProxy->getSourceNotificationEvent().subscribe(std::bind(&MockNotificationsClient::onSourceNotificationEvent, std::ref(mock),
std::placeholders::_1, std::placeholders::_2));
am_NotificationPayload_s orig;
- orig.type = am_NotificationType_e::NT_MAX;
+ orig.type = NT_UNKNOWN;
orig.value = 1;
org::genivi::am::am_NotificationPayload_s dest;
- dest.type = static_cast<org::genivi::am::am_NotificationType_pe>(NT_MAX);
+ dest.type = NT_UNKNOWN;
dest.value = 1;
EXPECT_CALL(mock, onSourceNotificationEvent(1, dest));
@@ -1095,11 +1095,11 @@ TEST_F(CAmCommandSenderCAPITest, onMainSinkNotificationConfigurationChangedEvent
auto subscription = env->mProxy->getMainSinkNotificationConfigurationChangedEvent().subscribe(std::bind(&MockNotificationsClient::onMainSinkNotificationConfigurationChangedEvent, std::ref(mock),
std::placeholders::_1, std::placeholders::_2));
am_NotificationConfiguration_s orig;
- orig.type = am_NotificationType_e::NT_MAX;
+ orig.type = NT_UNKNOWN;
orig.parameter = 1;
orig.status = am_NotificationStatus_e::NS_MAX;
org::genivi::am::am_NotificationConfiguration_s dest;
- dest.type = static_cast<org::genivi::am::am_NotificationType_pe>(NT_MAX);
+ dest.type = NT_UNKNOWN;
dest.parameter = 1;
dest.status = org::genivi::am::am_NotificationStatus_e::NS_MAX;
@@ -1120,11 +1120,11 @@ TEST_F(CAmCommandSenderCAPITest, onMainSourceNotificationConfigurationChangedEve
auto subscription = env->mProxy->getMainSourceNotificationConfigurationChangedEvent().subscribe(std::bind(&MockNotificationsClient::onMainSourceNotificationConfigurationChangedEvent, std::ref(mock),
std::placeholders::_1, std::placeholders::_2));
am_NotificationConfiguration_s orig;
- orig.type = am_NotificationType_e::NT_MAX;
+ orig.type = NT_UNKNOWN;
orig.parameter = 1;
orig.status = am_NotificationStatus_e::NS_MAX;
org::genivi::am::am_NotificationConfiguration_s dest;
- dest.type =static_cast<org::genivi::am::am_NotificationType_pe>(NT_MAX);
+ dest.type = NT_UNKNOWN;
dest.parameter = 1;
dest.status = org::genivi::am::am_NotificationStatus_e::NS_MAX;
diff --git a/PluginCommandInterfaceDbus/include/CommandInterface.xml b/PluginCommandInterfaceDbus/include/CommandInterface.xml
index 87cb6a2..bab2604 100644
--- a/PluginCommandInterfaceDbus/include/CommandInterface.xml
+++ b/PluginCommandInterfaceDbus/include/CommandInterface.xml
@@ -69,13 +69,13 @@
<method name="GetListMainSinkSoundProperties">
<arg type="q" name="sinkID" direction="in"/>
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nn)" name="listSoundProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listSoundProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; -->
</method>
<method name="GetListMainSourceSoundProperties">
<arg type="q" name="sourceID" direction="in"/>
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nn)" name="listSourceProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listSourceProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; -->
</method>
<method name="GetListSourceClasses">
@@ -194,13 +194,13 @@
<signal name="SinkUpdated">
<arg type="q" name="sinkID" direction="out"/>
<arg type="q" name="sinkClassID" direction="out"/>
- <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; -->
</signal>
<signal name="SourceUpdated">
<arg type="q" name="sourceID" direction="out"/>
<arg type="q" name="sourceClassID" direction="out"/>
- <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->
+ <arg type="a(nn)" name="listMainSinkProperties" direction="out"/> <!-- am_CustomMainSoundPropertyType_t type; int16_t value; -->
</signal>
<signal name="SourceNotification">
diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
index 4dcc0f1..11cacb4 100644
--- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
+++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp
@@ -142,7 +142,7 @@ void IAmCommandReceiverShadow::setMainSinkSoundProperty(DBusConnection *conn, DB
dbus_int16_t value = 0;
mDBUSMessageHandler.getProperty(type, value);
am_MainSoundProperty_s mainSoundProperty;
- mainSoundProperty.type = (am_MainSoundPropertyType_e) type;
+ mainSoundProperty.type = (am_CustomMainSoundPropertyType_t) type;
mainSoundProperty.value = (int32_t) value;
am_Error_e returnCode = mpIAmCommandReceive->setMainSinkSoundProperty(mainSoundProperty, sinkID);
mDBUSMessageHandler.initReply(msg);
@@ -163,7 +163,7 @@ void IAmCommandReceiverShadow::setMainSourceSoundProperty(DBusConnection *conn,
dbus_int16_t value = 0;
mDBUSMessageHandler.getProperty(type, value);
am_MainSoundProperty_s mainSoundProperty;
- mainSoundProperty.type = (am_MainSoundPropertyType_e) type;
+ mainSoundProperty.type = (am_CustomMainSoundPropertyType_t) type;
mainSoundProperty.value = (int32_t) value;
am_Error_e returnCode = mpIAmCommandReceive->setMainSourceSoundProperty(mainSoundProperty, sourceID);
mDBUSMessageHandler.initReply(msg);
@@ -183,7 +183,7 @@ void IAmCommandReceiverShadow::setSystemProperty(DBusConnection *conn, DBusMessa
dbus_int16_t value = 0;
mDBUSMessageHandler.getProperty(type, value);
am_SystemProperty_s systemProperty;
- systemProperty.type = (am_SystemPropertyType_e) type;
+ systemProperty.type = (am_CustomSystemPropertyType_t) type;
systemProperty.value = (int32_t) value;
am_Error_e returnCode = mpIAmCommandReceive->setSystemProperty(systemProperty);
mDBUSMessageHandler.initReply(msg);
@@ -465,7 +465,7 @@ void am::IAmCommandReceiverShadow::setSinkMainNotificationConfiguration(DBusConn
dbus_int16_t parameter = 0;
mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter);
am_NotificationConfiguration_s mainNotificationConfiguration;
- mainNotificationConfiguration.type = static_cast<am_NotificationType_e> (type);
+ mainNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (type);
mainNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (status);
mainNotificationConfiguration.parameter = static_cast<int16_t>(parameter);
am_Error_e returnCode = mpIAmCommandReceive->setMainSinkNotificationConfiguration(sinkID,mainNotificationConfiguration);
@@ -488,7 +488,7 @@ void am::IAmCommandReceiverShadow::setSourceMainNotificationConfiguration(DBusCo
dbus_int16_t parameter = 0;
mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter);
am_NotificationConfiguration_s mainNotificationConfiguration;
- mainNotificationConfiguration.type = static_cast<am_NotificationType_e> (type);
+ mainNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (type);
mainNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (status);
mainNotificationConfiguration.parameter = static_cast<int16_t>(parameter);
am_Error_e returnCode = mpIAmCommandReceive->setMainSourceNotificationConfiguration(sourceID,mainNotificationConfiguration);
diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
index 59b0b25..9aaa766 100644
--- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
@@ -109,7 +109,7 @@ arg0=list;
ACTION(returnListMainSinkSoundProperties){
std::vector<am::am_MainSoundProperty_s> list;
am::am_MainSoundProperty_s listItem;
-listItem.type=MSP_EXAMPLE_MID;
+listItem.type=MSP_GENIVI_MID;
listItem.value=223;
list.push_back(listItem);
listItem.type=MSP_UNKNOWN;
@@ -122,7 +122,7 @@ ACTION(returnListSourceClasses){
std::vector<am::am_SourceClass_s> list;
am::am_SourceClass_s listItem;
am::am_ClassProperty_s property;
-property.classProperty=static_cast<am_ClassProperty_e>(2);
+property.classProperty=static_cast<am_CustomClassProperty_t>(2);
property.value=12;
listItem.name="FirstCLass";
listItem.sourceClassID=23;
@@ -139,7 +139,7 @@ ACTION(returnListSinkClasses){
std::vector<am::am_SinkClass_s> list;
am::am_SinkClass_s listItem;
am::am_ClassProperty_s property;
-property.classProperty=static_cast<am_ClassProperty_e>(1);
+property.classProperty=static_cast<am_CustomClassProperty_t>(1);
property.value=122;
listItem.name="FirstCLass";
listItem.sinkClassID=2123;
diff --git a/PluginControlInterface/include/CAmControlSenderBase.h b/PluginControlInterface/include/CAmControlSenderBase.h
index 82ee056..df2f9c9 100644
--- a/PluginControlInterface/include/CAmControlSenderBase.h
+++ b/PluginControlInterface/include/CAmControlSenderBase.h
@@ -69,15 +69,15 @@ public:
void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error);
void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error);
void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error);
- am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats);
+ am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t>& listPrioConnectionFormats);
void getInterfaceVersion(std::string& version) const;
void confirmCommandReady(const am_Error_e error) ;
void confirmRoutingReady(const am_Error_e error) ;
void confirmCommandRundown(const am_Error_e error) ;
void confirmRoutingRundown(const am_Error_e error) ;
- am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
- am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
+ am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+ am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
void cbAckSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error) ;
void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
diff --git a/PluginControlInterface/include/IAmControlReceiverShadow.h b/PluginControlInterface/include/IAmControlReceiverShadow.h
index ed8c774..2557836 100644
--- a/PluginControlInterface/include/IAmControlReceiverShadow.h
+++ b/PluginControlInterface/include/IAmControlReceiverShadow.h
@@ -35,13 +35,13 @@ public:
IAmControlReceiverShadow(IAmControlReceive* iReceiveInterface, CAmSocketHandler* iSocketHandler);
~IAmControlReceiverShadow();
am_Error_e getRoute(bool onlyfree, am_sourceID_t sourceID, am_sinkID_t sinkID, std::vector<am_Route_s>& returnList);
- am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, am_ConnectionFormat_e format, am_sourceID_t sourceID, am_sinkID_t sinkID);
+ am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, am_CustomConnectionFormat_t format, am_sourceID_t sourceID, am_sinkID_t sinkID);
am_Error_e disconnect(am_Handle_s& handle, am_connectionID_t connectionID);
- am_Error_e crossfade(am_Handle_s& handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_RampType_e rampType, am_time_t rampTime);
+ am_Error_e crossfade(am_Handle_s& handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_CustomRampType_t rampType, am_time_t rampTime);
am_Error_e abortAction(am_Handle_s handle);
am_Error_e setSourceState(am_Handle_s& handle, am_sourceID_t sourceID, am_SourceState_e state);
- am_Error_e setSinkVolume(am_Handle_s& handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_e ramp, am_time_t time);
- am_Error_e setSourceVolume(am_Handle_s& handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_e rampType, am_time_t time);
+ am_Error_e setSinkVolume(am_Handle_s& handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time);
+ am_Error_e setSourceVolume(am_Handle_s& handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t rampType, am_time_t time);
am_Error_e setSinkSoundProperties(am_Handle_s& handle, am_sinkID_t sinkID, std::vector<am_SoundProperty_s>& soundProperty);
am_Error_e setSinkSoundProperty(am_Handle_s& handle, am_sinkID_t sinkID, am_SoundProperty_s& soundProperty);
am_Error_e setSourceSoundProperties(am_Handle_s& handle, am_sourceID_t sourceID, std::vector<am_SoundProperty_s>& soundProperty);
diff --git a/PluginControlInterface/src/CAmControlSenderBase.cpp b/PluginControlInterface/src/CAmControlSenderBase.cpp
index f47bdc6..7007bfe 100644
--- a/PluginControlInterface/src/CAmControlSenderBase.cpp
+++ b/PluginControlInterface/src/CAmControlSenderBase.cpp
@@ -197,7 +197,7 @@ am_Error_e CAmControlSenderBase::hookUserSetMainSinkSoundProperty(const am_sinkI
}
//I know this is bad - just for the reference, ok?
- sp.type = static_cast<am_SoundPropertyType_e>(soundProperty.type);
+ sp.type = static_cast<am_CustomSoundPropertyType_t>(soundProperty.type);
sp.value = (soundProperty.value - 5) * 30;
am_Error_e error;
if ((error = mControlReceiveInterface->setSinkSoundProperty(set.handle, sinkID, sp)) != E_OK)
@@ -565,7 +565,7 @@ void CAmControlSenderBase::setControllerRundown(const int16_t signal)
mControlReceiveInterface->confirmControllerRundown(E_OK);
}
-am_Error_e CAmControlSenderBase::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats)
+am_Error_e CAmControlSenderBase::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomAvailabilityReason_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t> & listPrioConnectionFormats)
{
(void) sourceID;
(void) sinkID;
@@ -812,7 +812,7 @@ NsmErrorStatus_e CAmControlSenderBase::hookSystemLifecycleRequest(const uint32_t
return (NsmErrorStatus_Error);
}
-am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
(void) sinkID;
(void) sinkClassID;
@@ -822,7 +822,7 @@ am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID,
return (E_NOT_USED);
}
-am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
{
(void) sourceID;
(void) sourceClassID;
@@ -832,7 +832,7 @@ am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sour
return (E_NOT_USED);
}
-am_Error_e CAmControlSenderBase::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmControlSenderBase::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
{
(void) gatewayID;
(void) listSourceConnectionFormats;
diff --git a/PluginControlInterface/src/IAmControlReceiverShadow.cpp b/PluginControlInterface/src/IAmControlReceiverShadow.cpp
index 6546deb..649d621 100644
--- a/PluginControlInterface/src/IAmControlReceiverShadow.cpp
+++ b/PluginControlInterface/src/IAmControlReceiverShadow.cpp
@@ -39,10 +39,10 @@ am_Error_e IAmControlReceiverShadow::getRoute(bool onlyfree, am_sourceID_t sourc
return (error);
}
-am_Error_e IAmControlReceiverShadow::connect(am_Handle_s & handle, am_connectionID_t & connectionID, am_ConnectionFormat_e format, am_sourceID_t sourceID, am_sinkID_t sinkID)
+am_Error_e IAmControlReceiverShadow::connect(am_Handle_s & handle, am_connectionID_t & connectionID, am_CustomConnectionFormat_t format, am_sourceID_t sourceID, am_sinkID_t sinkID)
{
am_Error_e error;
- mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s &, am_connectionID_t &, const am_ConnectionFormat_e, const am_sourceID_t, const am_sinkID_t, am_Handle_s, am_connectionID_t, am_ConnectionFormat_e, am_sourceID_t, am_sinkID_t>(mpIAmControlReceiver, &IAmControlReceive::connect, error, handle, connectionID, format, sourceID, sinkID);
+ mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s &, am_connectionID_t &, const am_CustomConnectionFormat_t, const am_sourceID_t, const am_sinkID_t, am_Handle_s, am_connectionID_t, am_CustomConnectionFormat_t, am_sourceID_t, am_sinkID_t>(mpIAmControlReceiver, &IAmControlReceive::connect, error, handle, connectionID, format, sourceID, sinkID);
return (error);
}
@@ -53,10 +53,10 @@ am_Error_e IAmControlReceiverShadow::disconnect(am_Handle_s & handle, am_connect
return (error);
}
-am_Error_e IAmControlReceiverShadow::crossfade(am_Handle_s & handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_RampType_e rampType, am_time_t rampTime)
+am_Error_e IAmControlReceiverShadow::crossfade(am_Handle_s & handle, am_HotSink_e hotSource, am_crossfaderID_t crossfaderID, am_CustomRampType_t rampType, am_time_t rampTime)
{
am_Error_e error;
- mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s &, const am_HotSink_e, const am_crossfaderID_t, const am_RampType_e, const am_time_t, am_Handle_s, am_HotSink_e, am_crossfaderID_t, am_RampType_e, am_time_t>(mpIAmControlReceiver, &IAmControlReceive::crossfade, error, handle, hotSource, crossfaderID, rampType, rampTime);
+ mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s &, const am_HotSink_e, const am_crossfaderID_t, const am_CustomRampType_t, const am_time_t, am_Handle_s, am_HotSink_e, am_crossfaderID_t, am_CustomRampType_t, am_time_t>(mpIAmControlReceiver, &IAmControlReceive::crossfade, error, handle, hotSource, crossfaderID, rampType, rampTime);
return (error);
}
@@ -75,17 +75,17 @@ am_Error_e IAmControlReceiverShadow::setSourceState(am_Handle_s & handle, am_sou
}
-am_Error_e IAmControlReceiverShadow::setSinkVolume(am_Handle_s & handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_e ramp, am_time_t time)
+am_Error_e IAmControlReceiverShadow::setSinkVolume(am_Handle_s & handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time)
{
am_Error_e error;
- mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s&, const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_e, am_time_t>(mpIAmControlReceiver, &IAmControlReceive::setSinkVolume, error, handle, sinkID, volume, ramp, time);
+ mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s&, const am_sinkID_t, const am_volume_t, const am_CustomRampType_t, const am_time_t, am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>(mpIAmControlReceiver, &IAmControlReceive::setSinkVolume, error, handle, sinkID, volume, ramp, time);
return (error);
}
-am_Error_e IAmControlReceiverShadow::setSourceVolume(am_Handle_s & handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_e rampType, am_time_t time)
+am_Error_e IAmControlReceiverShadow::setSourceVolume(am_Handle_s & handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t rampType, am_time_t time)
{
am_Error_e error;
- mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s&, const am_sourceID_t, const am_volume_t, const am_RampType_e, const am_time_t, am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_e, am_time_t>(mpIAmControlReceiver, &IAmControlReceive::setSourceVolume, error, handle, sourceID, volume, rampType, time);
+ mCAmSerializer.syncCall<IAmControlReceive, am_Error_e, am_Handle_s&, const am_sourceID_t, const am_volume_t, const am_CustomRampType_t, const am_time_t, am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>(mpIAmControlReceiver, &IAmControlReceive::setSourceVolume, error, handle, sourceID, volume, rampType, time);
return (error);
}
diff --git a/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp b/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp
index 7246ff6..3eed9f2 100644
--- a/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp
+++ b/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp
@@ -96,7 +96,7 @@ TEST_F(CAmControlReceiverShadowTest,connect)
handle.handle = 1;
handle.handleType = H_CONNECT;
am_connectionID_t connectionID(3), connectionIDReturn;
- am_ConnectionFormat_e connectionFormat(CF_GENIVI_ANALOG);
+ am_CustomAvailabilityReason_t connectionFormat(CF_GENIVI_ANALOG);
am_sourceID_t sourceID(1);
am_sinkID_t sinkID(2);
diff --git a/PluginControlInterface/test/MockIAmControlReceive.h b/PluginControlInterface/test/MockIAmControlReceive.h
index 81e69da..eb116b1 100644
--- a/PluginControlInterface/test/MockIAmControlReceive.h
+++ b/PluginControlInterface/test/MockIAmControlReceive.h
@@ -30,19 +30,19 @@ class MockIAmControlReceive : public IAmControlReceive {
MOCK_METHOD4(getRoute,
am_Error_e(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList));
MOCK_METHOD5(connect,
- am_Error_e(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID));
+ am_Error_e(am_Handle_s& handle, am_connectionID_t& connectionID, const am_CustomAvailabilityReason_t format, const am_sourceID_t sourceID, const am_sinkID_t sinkID));
MOCK_METHOD2(disconnect,
am_Error_e(am_Handle_s& handle, const am_connectionID_t connectionID));
MOCK_METHOD5(crossfade,
- am_Error_e(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime));
+ am_Error_e(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_CustomRampType_t rampType, const am_time_t rampTime));
MOCK_METHOD1(abortAction,
am_Error_e(const am_Handle_s handle));
MOCK_METHOD3(setSourceState,
am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state));
MOCK_METHOD5(setSinkVolume,
- am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
+ am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time));
MOCK_METHOD5(setSourceVolume,
- am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time));
+ am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t rampType, const am_time_t time));
MOCK_METHOD3(setSinkSoundProperties,
am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& soundProperty));
MOCK_METHOD3(setSinkSoundProperty,
@@ -170,11 +170,11 @@ class MockIAmControlReceive : public IAmControlReceive {
MOCK_METHOD1(getSocketHandler,
am_Error_e(CAmSocketHandler*& socketHandler));
MOCK_METHOD5(changeSourceDB,
- am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+ am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
MOCK_METHOD5(changeSinkDB,
- am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+ am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
MOCK_METHOD4(changeGatewayDB,
- am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
+ am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
MOCK_METHOD2(setVolumes,
am_Error_e(am_Handle_s& handle, const std::vector<am_Volumes_s>& listVolumes));
MOCK_METHOD3(setSinkNotificationConfiguration,
diff --git a/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h b/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h
index 6d1fbed..22fded2 100644
--- a/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h
+++ b/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h
@@ -125,16 +125,16 @@ public:
void setRoutingReady(const uint16_t handle) ;
void setRoutingRundown(const uint16_t handle) ;
am_Error_e asyncAbort(const am_Handle_s handle) ;
- am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) ;
+ am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat) ;
am_Error_e asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID) ;
- am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) ;
- am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) ;
+ am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) ;
+ am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) ;
am_Error_e asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state) ;
am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& listSoundProperties) ;
am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) ;
am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& listSoundProperties) ;
am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) ;
- am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time) ;
+ am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time) ;
am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState) ;
am_Error_e returnBusName(std::string& BusName) const ;
void getInterfaceVersion(std::string& version) const ;
@@ -245,7 +245,7 @@ private:
class asycConnectWorker: public CAmWorker
{
public:
- asycConnectWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat);
+ asycConnectWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat);
void start2work();
void cancelWork();
private:
@@ -255,7 +255,7 @@ private:
am_connectionID_t mConnectionID;
am_sourceID_t mSourceID;
am_sinkID_t mSinkID;
- am_ConnectionFormat_e mConnectionFormat;
+ am_CustomConnectionFormat_t mConnectionFormat;
};
/**
@@ -272,7 +272,7 @@ private:
IAmRoutingReceiverShadow *mShadow;
am_Handle_s mHandle;
am_connectionID_t mConnectionID;
- am_ConnectionFormat_e mConnectionFormat;
+ am_CustomConnectionFormat_t mConnectionFormat;
};
/**
@@ -286,7 +286,7 @@ private:
class asyncSetSinkVolumeWorker: public CAmWorker
{
public:
- asyncSetSinkVolumeWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
+ asyncSetSinkVolumeWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
void start2work();
void cancelWork();
private:
@@ -296,14 +296,14 @@ private:
am_Handle_s mHandle;
am_sinkID_t mSinkID;
am_volume_t mVolume;
- am_RampType_e mRamp;
+ am_CustomRampType_t mRamp;
am_time_t mTime;
};
class asyncSetSourceVolumeWorker: public CAmWorker
{
public:
- asyncSetSourceVolumeWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sourceID_t SourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
+ asyncSetSourceVolumeWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool* pool, IAmRoutingReceiverShadow* shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sourceID_t SourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
void start2work();
void cancelWork();
private:
@@ -313,7 +313,7 @@ private:
am_Handle_s mHandle;
am_sourceID_t mSourceID;
am_volume_t mVolume;
- am_RampType_e mRamp;
+ am_CustomRampType_t mRamp;
am_time_t mTime;
};
diff --git a/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp
index d6680d5..58499b0 100644
--- a/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp
+++ b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp
@@ -266,7 +266,7 @@ am_Error_e CAmRoutingSenderAsync::asyncAbort(const am_Handle_s handle)
return (E_UNKNOWN);
}
-am_Error_e CAmRoutingSenderAsync::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)
+am_Error_e CAmRoutingSenderAsync::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat)
{
assert(mReceiveInterface!=0);
assert(handle.handle!=0);
@@ -364,7 +364,7 @@ am_Error_e CAmRoutingSenderAsync::asyncDisconnect(const am_Handle_s handle, cons
return (E_OK);
}
-am_Error_e CAmRoutingSenderAsync::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSenderAsync::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
assert(mReceiveInterface!=0);
assert(handle.handle!=0);
@@ -406,7 +406,7 @@ am_Error_e CAmRoutingSenderAsync::asyncSetSinkVolume(const am_Handle_s handle, c
return (E_OK);
}
-am_Error_e CAmRoutingSenderAsync::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSenderAsync::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
assert(mReceiveInterface!=0);
assert(handle.handle!=0);
@@ -532,7 +532,7 @@ am_Error_e CAmRoutingSenderAsync::asyncSetSinkSoundProperty(const am_Handle_s ha
return (E_OK);
}
-am_Error_e CAmRoutingSenderAsync::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmRoutingSenderAsync::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time)
{
//todo: implement crossfader
(void) handle;
@@ -655,17 +655,17 @@ std::vector<am_Sink_s> CAmRoutingSenderAsync::createSinkTable()
std::vector<am_Sink_s> table;
am_Sink_s item;
am_SoundProperty_s sp;
- sp.type = SP_EXAMPLE_BASS;
+ sp.type = SP_GENIVI_BASS;
sp.value = 0;
std::vector<am_MainSoundProperty_s> listMainSoundProperties;
am_MainSoundProperty_s msp;
- msp.type = MSP_EXAMPLE_BASS;
+ msp.type = MSP_GENIVI_BASS;
msp.value = 5;
listMainSoundProperties.push_back(msp);
- msp.type = MSP_EXAMPLE_MID;
+ msp.type = MSP_GENIVI_MID;
listMainSoundProperties.push_back(msp);
- msp.type = MSP_EXAMPLE_TREBLE;
+ msp.type = MSP_GENIVI_TREBLE;
listMainSoundProperties.push_back(msp);
for (int16_t i = 0; i <= 10; i++)
{
@@ -926,7 +926,7 @@ std::vector<am_Gateway_s> CAmRoutingSenderAsync::createGatewayTable()
return (table);
}
-asycConnectWorker::asycConnectWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow* shadow, const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) :
+asycConnectWorker::asycConnectWorker(CAmRoutingSenderAsync * asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow* shadow, const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat) :
CAmWorker(pool), //
mAsyncSender(asyncSender), //
mShadow(shadow), //
@@ -1008,7 +1008,7 @@ void asycDisConnectWorker::cancelWork()
mShadow->ackDisconnect(mHandle, mConnectionID, E_ABORTED);
}
-asyncSetSinkVolumeWorker::asyncSetSinkVolumeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) :
+asyncSetSinkVolumeWorker::asyncSetSinkVolumeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) :
CAmWorker(pool), //
mAsyncSender(asyncSender), //
mShadow(shadow), //
@@ -1057,7 +1057,7 @@ void asyncSetSinkVolumeWorker::cancelWork()
mShadow->ackSetSinkVolumeChange(mHandle, mCurrentVolume, E_ABORTED);
}
-asyncSetSourceVolumeWorker::asyncSetSourceVolumeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sourceID_t SourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) :
+asyncSetSourceVolumeWorker::asyncSetSourceVolumeWorker(CAmRoutingSenderAsync *asyncSender, CAmWorkerThreadPool *pool, IAmRoutingReceiverShadow *shadow, const am_volume_t currentVolume, const am_Handle_s handle, const am_sourceID_t SourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time) :
CAmWorker(pool), //
mAsyncSender(asyncSender), //
mShadow(shadow), //
diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
index 8111494..6fff1a4 100644
--- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
+++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
@@ -21,7 +21,7 @@
#include "TAmPluginTemplate.h"
#include "MockIAmRoutingReceive.h"
#include "shared/CAmDltWrapper.h"
-#include "routing/IAmRoutingSend.h"
+
using namespace am;
using namespace testing;
@@ -29,11 +29,12 @@ using namespace testing;
static CAmEnvironment* env;
am_domainID_t CAmEnvironment::mDomainIDCount = 0;
-static IAmRoutingSend* pRouter;
+
CAmEnvironment::CAmEnvironment() :
pSocketHandler(),
- pReceiveInterface(),
+ pRouter(NULL),
+ pReceiveInterface(NULL),
ptimerCallback(this, &CAmEnvironment::timerCallback)
{
DefaultValue<am_Error_e>::Set(E_OK); // Sets the default value to be returned.
@@ -46,18 +47,19 @@ CAmEnvironment::~CAmEnvironment()
void CAmEnvironment::SetUp()
{
- ::testing::GTEST_FLAG(throw_on_failure) = false;
logInfo("RoutingSendInterface Test started ");
+ pReceiveInterface = new MockIAmRoutingReceive();
+
std::vector<int> domainIDs;
domainIDs.push_back(0);
domainIDs.push_back(1);
- EXPECT_TRUE(Mock::VerifyAndClearExpectations(&env->pReceiveInterface));
- EXPECT_CALL(env->pReceiveInterface,getSocketHandler(_)).WillOnce(DoAll(SetArgReferee<0>(&env->pSocketHandler), Return(E_OK)));
- EXPECT_CALL(env->pReceiveInterface,registerDomain(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleDomainRegister));
- EXPECT_CALL(env->pReceiveInterface,registerSource(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleSourceRegister));
- EXPECT_CALL(env->pReceiveInterface,registerSink(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleSinkRegister));
- EXPECT_CALL(env->pReceiveInterface,confirmRoutingReady(_,_)).Times(1);
+
+ EXPECT_CALL(*env->pReceiveInterface,getSocketHandler(_)).WillOnce(DoAll(SetArgReferee<0>(&env->pSocketHandler), Return(E_OK)));
+ EXPECT_CALL(*env->pReceiveInterface,registerDomain(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleDomainRegister));
+ EXPECT_CALL(*env->pReceiveInterface,registerSource(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleSourceRegister));
+ EXPECT_CALL(*env->pReceiveInterface,registerSink(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleSinkRegister));
+ EXPECT_CALL(*env->pReceiveInterface,confirmRoutingReady(_,_)).Times(1);
IAmRoutingSend* (*createFunc)();
void* tempLibHandle = NULL;
@@ -78,7 +80,7 @@ void CAmEnvironment::SetUp()
exit(1);
}
- pRouter->startupInterface(&env->pReceiveInterface);
+ pRouter->startupInterface(env->pReceiveInterface);
pRouter->setRoutingReady(10);
timespec t;
@@ -95,36 +97,10 @@ void CAmEnvironment::SetUp()
void CAmEnvironment::TearDown()
{
- ::testing::GTEST_FLAG(throw_on_failure) = true;
-}
-
-CAmRoutingReceiverAsync::CAmRoutingReceiverAsync() :
- ptimerCallback(this, &CAmRoutingReceiverAsync::timerCallback)
-{
-}
-
-CAmRoutingReceiverAsync::~CAmRoutingReceiverAsync()
-{
-}
-
-void CAmRoutingReceiverAsync::timerCallback(sh_timerHandle_t handle, void *userData)
-{
- (void) handle;
- (void) userData;
- env->pSocketHandler.stop_listening();
-}
-
-void CAmRoutingReceiverAsync::SetUp()
-{
-// timespec t;
-// t.tv_nsec = 0;
-// t.tv_sec = 2;
-//
-// sh_timerHandle_t handle;
-//
-// shTimerCallBack *buf = &ptimerCallback;
-// //lets use a timeout so the test will finish
-// env->pSocketHandler.addTimer(t, buf, handle, (void*) NULL);
+ if(pReceiveInterface)
+ delete pReceiveInterface, pReceiveInterface = NULL;
+ if(pRouter)
+ delete pRouter, pRouter = NULL;
}
std::vector<std::string> CAmEnvironment::returnListPlugins()
@@ -162,21 +138,54 @@ void CAmEnvironment::timerCallback(sh_timerHandle_t handle, void *userData)
env->pSocketHandler.stop_listening();
}
+
+CAmRoutingReceiverAsync::CAmRoutingReceiverAsync() :
+ ptimerCallback(this, &CAmRoutingReceiverAsync::timerCallback)
+{
+}
+
+CAmRoutingReceiverAsync::~CAmRoutingReceiverAsync()
+{
+}
+
+void CAmRoutingReceiverAsync::timerCallback(sh_timerHandle_t handle, void *userData)
+{
+ (void) handle;
+ (void) userData;
+ env->pSocketHandler.stop_listening();
+}
+
+void CAmRoutingReceiverAsync::SetUp()
+{
+// timespec t;
+// t.tv_nsec = 0;
+// t.tv_sec = 2;
+//
+// sh_timerHandle_t handle;
+//
+// shTimerCallBack *buf = &ptimerCallback;
+// //lets use a timeout so the test will finish
+// env->pSocketHandler.addTimer(t, buf, handle, (void*) NULL);
+}
+
void CAmRoutingReceiverAsync::TearDown()
{
+
}
+
TEST_F(CAmRoutingReceiverAsync,setDomainState)
{
am_domainID_t domainID = 1;
am_DomainState_e state = DS_INDEPENDENT_RUNDOWN;
- EXPECT_CALL(env->pReceiveInterface,hookDomainStateChange(_,DS_INDEPENDENT_RUNDOWN)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface,hookDomainStateChange(_,DS_INDEPENDENT_RUNDOWN)).Times(1);
- ASSERT_EQ(E_OK, pRouter->setDomainState(domainID,state));
+ ASSERT_EQ(E_OK, env->pRouter->setDomainState(domainID,state));
env->pSocketHandler.start_listenting();
}
+
TEST_F(CAmRoutingReceiverAsync,setSourceSoundProperty)
{
@@ -186,12 +195,12 @@ TEST_F(CAmRoutingReceiverAsync,setSourceSoundProperty)
am_sourceID_t sourceID = 3;
am_SoundProperty_s property;
- property.type = SP_EXAMPLE_MID;
+ property.type = SP_GENIVI_MID;
property.value = 24;
- EXPECT_CALL(env->pReceiveInterface,ackSetSourceSoundProperty(_,E_OK)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface,ackSetSourceSoundProperty(_,E_OK)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncSetSourceSoundProperty(handle,sourceID,property));
+ ASSERT_EQ(E_OK, env->pRouter->asyncSetSourceSoundProperty(handle,sourceID,property));
env->pSocketHandler.start_listenting();
}
@@ -204,12 +213,12 @@ TEST_F(CAmRoutingReceiverAsync,setSinkSoundProperty)
am_sinkID_t sinkID = 1;
am_SoundProperty_s property;
- property.type = SP_EXAMPLE_MID;
+ property.type = SP_GENIVI_MID;
property.value = 24;
- EXPECT_CALL(env->pReceiveInterface,ackSetSinkSoundProperty(_,E_OK)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface,ackSetSinkSoundProperty(_,E_OK)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncSetSinkSoundProperty(handle,sinkID,property));
+ ASSERT_EQ(E_OK, env->pRouter->asyncSetSinkSoundProperty(handle,sinkID,property));
env->pSocketHandler.start_listenting();
}
@@ -223,9 +232,9 @@ TEST_F(CAmRoutingReceiverAsync,setSourceState)
am_sourceID_t sourceID = 1;
am_SourceState_e state = SS_OFF;
- EXPECT_CALL(env->pReceiveInterface,ackSetSourceState(_,E_OK)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface,ackSetSourceState(_,E_OK)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncSetSourceState(handle,sourceID,state));
+ ASSERT_EQ(E_OK, env->pRouter->asyncSetSourceState(handle,sourceID,state));
env->pSocketHandler.start_listenting();
}
@@ -238,13 +247,13 @@ TEST_F(CAmRoutingReceiverAsync,setSourceVolume)
am_sourceID_t sourceID = 3;
am_volume_t volume = 3;
- am_RampType_e ramp = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t ramp = RAMP_GENIVI_DIRECT;
am_time_t myTime = 25;
- EXPECT_CALL(env->pReceiveInterface,ackSourceVolumeTick(_,sourceID,_)).Times(AtLeast(1));
- EXPECT_CALL(env->pReceiveInterface,ackSetSourceVolumeChange(_,volume,E_OK)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface,ackSourceVolumeTick(_,sourceID,_)).Times(AtLeast(1));
+ EXPECT_CALL(*env->pReceiveInterface,ackSetSourceVolumeChange(_,volume,E_OK)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncSetSourceVolume(handle,sourceID,volume,ramp,myTime));
+ ASSERT_EQ(E_OK, env->pRouter->asyncSetSourceVolume(handle,sourceID,volume,ramp,myTime));
env->pSocketHandler.start_listenting();
}
@@ -257,13 +266,13 @@ TEST_F(CAmRoutingReceiverAsync,setSinkVolume)
am_sinkID_t sinkID = 1;
am_volume_t volume = 9;
- am_RampType_e ramp = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t ramp = RAMP_GENIVI_DIRECT;
am_time_t myTime = 25;
- EXPECT_CALL(env->pReceiveInterface,ackSinkVolumeTick(_,sinkID,_)).Times(AtLeast(2));
- EXPECT_CALL(env->pReceiveInterface,ackSetSinkVolumeChange(_,volume,E_OK)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface,ackSinkVolumeTick(_,sinkID,_)).Times(AtLeast(2));
+ EXPECT_CALL(*env->pReceiveInterface,ackSetSinkVolumeChange(_,volume,E_OK)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncSetSinkVolume(handle,sinkID,volume,ramp,myTime));
+ ASSERT_EQ(E_OK, env->pRouter->asyncSetSinkVolume(handle,sinkID,volume,ramp,myTime));
env->pSocketHandler.start_listenting();
}
@@ -276,15 +285,15 @@ TEST_F(CAmRoutingReceiverAsync,setSinkVolumeAbort)
am_sinkID_t sinkID = 2;
am_volume_t volume = 25;
- am_RampType_e ramp = RAMP_GENIVI_DIRECT;
+ am_CustomRampType_t ramp = RAMP_GENIVI_DIRECT;
am_time_t myTime = 25;
- EXPECT_CALL(env->pReceiveInterface, ackSinkVolumeTick(_,sinkID,_));
- EXPECT_CALL(env->pReceiveInterface,ackSetSinkVolumeChange(_,AllOf(Ne(volume),Ne(0)),E_ABORTED)).Times(1);
+ EXPECT_CALL(*env->pReceiveInterface, ackSinkVolumeTick(_,sinkID,_));
+ EXPECT_CALL(*env->pReceiveInterface,ackSetSinkVolumeChange(_,AllOf(Ne(volume),Ne(0)),E_ABORTED)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncSetSinkVolume(handle,sinkID,volume,ramp,myTime));
+ ASSERT_EQ(E_OK, env->pRouter->asyncSetSinkVolume(handle,sinkID,volume,ramp,myTime));
sleep(0.5);
- ASSERT_EQ(E_OK, pRouter->asyncAbort(handle));
+ ASSERT_EQ(E_OK, env->pRouter->asyncAbort(handle));
env->pSocketHandler.start_listenting();
}
@@ -297,9 +306,9 @@ TEST_F(CAmRoutingReceiverAsync,disconnectNonExisting)
am_connectionID_t connectionID = 4;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
- EXPECT_CALL(env->pReceiveInterface,ackDisconnect(_,connectionID,E_OK)).Times(0);
- ASSERT_EQ(E_NON_EXISTENT, pRouter->asyncDisconnect(handle,connectionID));
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
+ EXPECT_CALL(*env->pReceiveInterface,ackDisconnect(_,connectionID,E_OK)).Times(0);
+ ASSERT_EQ(E_NON_EXISTENT, env->pRouter->asyncDisconnect(handle,connectionID));
env->pSocketHandler.start_listenting();
}
@@ -317,12 +326,12 @@ TEST_F(CAmRoutingReceiverAsync,disconnectTooEarly)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
- EXPECT_CALL(env->pReceiveInterface,ackDisconnect(_,connectionID,E_OK)).Times(0);
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle_c,connectionID,sourceID,sinkID,format));
- ASSERT_EQ(E_NON_EXISTENT, pRouter->asyncDisconnect(handle,connectionID));
+ EXPECT_CALL(*env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
+ EXPECT_CALL(*env->pReceiveInterface,ackDisconnect(_,connectionID,E_OK)).Times(0);
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle_c,connectionID,sourceID,sinkID,format));
+ ASSERT_EQ(E_NON_EXISTENT, env->pRouter->asyncDisconnect(handle,connectionID));
env->pSocketHandler.start_listenting();
}
@@ -340,14 +349,14 @@ TEST_F(CAmRoutingReceiverAsync,disconnectAbort)
am_connectionID_t connectionID = 5;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
- EXPECT_CALL(env->pReceiveInterface, ackDisconnect(_,connectionID,E_ABORTED));
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle_c,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
+ EXPECT_CALL(*env->pReceiveInterface, ackDisconnect(_,connectionID,E_ABORTED));
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle_c,connectionID,sourceID,sinkID,format));
sleep(2);
- ASSERT_EQ(E_OK, pRouter->asyncDisconnect(handle,connectionID));
- ASSERT_EQ(E_OK, pRouter->asyncAbort(handle));
+ ASSERT_EQ(E_OK, env->pRouter->asyncDisconnect(handle,connectionID));
+ ASSERT_EQ(E_OK, env->pRouter->asyncAbort(handle));
env->pSocketHandler.start_listenting();
}
@@ -365,13 +374,13 @@ TEST_F(CAmRoutingReceiverAsync,disconnect)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
- EXPECT_CALL(env->pReceiveInterface, ackDisconnect(_,connectionID,E_OK));
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle_c,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
+ EXPECT_CALL(*env->pReceiveInterface, ackDisconnect(_,connectionID,E_OK));
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle_c,connectionID,sourceID,sinkID,format));
sleep(2);
- ASSERT_EQ(E_OK, pRouter->asyncDisconnect(handle,connectionID));
+ ASSERT_EQ(E_OK, env->pRouter->asyncDisconnect(handle,connectionID));
env->pSocketHandler.start_listenting();
}
@@ -385,12 +394,12 @@ TEST_F(CAmRoutingReceiverAsync,connectAbortTooLate)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(1);
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
sleep(3);
- ASSERT_EQ(E_NON_EXISTENT, pRouter->asyncAbort(handle));
+ ASSERT_EQ(E_NON_EXISTENT, env->pRouter->asyncAbort(handle));
env->pSocketHandler.start_listenting();
}
@@ -404,12 +413,12 @@ TEST_F(CAmRoutingReceiverAsync,connectAbort)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,connectionID,E_ABORTED)).Times(1);
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,connectionID,E_ABORTED)).Times(1);
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
sleep(0.5);
- ASSERT_EQ(E_OK, pRouter->asyncAbort(handle));
+ ASSERT_EQ(E_OK, env->pRouter->asyncAbort(handle));
env->pSocketHandler.start_listenting();
}
@@ -423,10 +432,10 @@ TEST_F(CAmRoutingReceiverAsync,connectWrongFormat)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_MONO;
+ am_CustomConnectionFormat_t format = CF_GENIVI_MONO;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
- ASSERT_EQ(E_WRONG_FORMAT, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
+ ASSERT_EQ(E_WRONG_FORMAT, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
env->pSocketHandler.start_listenting();
}
@@ -440,10 +449,10 @@ TEST_F(CAmRoutingReceiverAsync,connectWrongSink)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 122;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
- ASSERT_EQ(E_NON_EXISTENT, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
+ ASSERT_EQ(E_NON_EXISTENT, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
env->pSocketHandler.start_listenting();
}
@@ -456,10 +465,10 @@ TEST_F(CAmRoutingReceiverAsync,connectWrongSource)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 25;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
- ASSERT_EQ(E_NON_EXISTENT, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,connectionID,E_OK)).Times(0);
+ ASSERT_EQ(E_NON_EXISTENT, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
env->pSocketHandler.start_listenting();
}
@@ -473,10 +482,10 @@ TEST_F(CAmRoutingReceiverAsync,connect)
am_connectionID_t connectionID = 4;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ EXPECT_CALL(*env->pReceiveInterface, ackConnect(_,connectionID,E_OK));
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
env->pSocketHandler.start_listenting();
}
@@ -490,23 +499,23 @@ TEST_F(CAmRoutingReceiverAsync,connectNoMoreThreads)
am_connectionID_t connectionID = 1;
am_sourceID_t sourceID = 2;
am_sinkID_t sinkID = 1;
- am_ConnectionFormat_e format = CF_GENIVI_ANALOG;
+ am_CustomConnectionFormat_t format = CF_GENIVI_ANALOG;
- EXPECT_CALL(env->pReceiveInterface,ackConnect(_,_,E_OK)).Times(10);
+ EXPECT_CALL(*env->pReceiveInterface,ackConnect(_,_,E_OK)).Times(10);
for (int i = 0; i < 10; i++)
{
handle.handle++;
connectionID++;
- ASSERT_EQ(E_OK, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ ASSERT_EQ(E_OK, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
}
- ASSERT_EQ(E_NOT_POSSIBLE, pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
+ ASSERT_EQ(E_NOT_POSSIBLE, env->pRouter->asyncConnect(handle,connectionID,sourceID,sinkID,format));
env->pSocketHandler.start_listenting();
}
int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv);
- ::testing::Environment* const env = ::testing::AddGlobalTestEnvironment(new CAmEnvironment);
+ CAmEnvironment* const env = (CAmEnvironment*)::testing::AddGlobalTestEnvironment(new CAmEnvironment);
(void) env;
return RUN_ALL_TESTS();
}
diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
index a9b2007..0c478e7 100644
--- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
+++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
@@ -24,6 +24,7 @@
#include "MockIAmRoutingReceive.h"
#include "shared/CAmSocketHandler.h"
#include "shared/CAmSerializer.h"
+#include "routing/IAmRoutingSend.h"
#define UNIT_TEST 1
@@ -34,7 +35,8 @@ class CAmEnvironment: public ::testing::Environment
{
public:
CAmSocketHandler pSocketHandler;
- MockIAmRoutingReceive pReceiveInterface;
+ IAmRoutingSend* pRouter;
+ MockIAmRoutingReceive *pReceiveInterface;
static std::vector<std::string> returnListPlugins();
static am_Error_e handleDomainRegister(const am_Domain_s& domainData, am_domainID_t& domainID);
static am_Error_e handleSourceRegister(const am_Source_s& sourceData, am_sourceID_t& sourceID);
diff --git a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h
index d9507ab..02ecd25 100644
--- a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h
+++ b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h
@@ -103,11 +103,11 @@ class MockIAmRoutingReceive : public IAmRoutingReceive {
MOCK_METHOD2(confirmRoutingRundown,
void(const uint16_t handle, const am_Error_e error));
MOCK_METHOD4(updateGateway,
- am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceFormats, const std::vector<am_ConnectionFormat_e>& listSinkFormats, const std::vector<bool>& convertionMatrix));
+ am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkFormats, const std::vector<bool>& convertionMatrix));
MOCK_METHOD5(updateSink,
- am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+ am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
MOCK_METHOD5(updateSource,
- am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+ am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
MOCK_METHOD3(ackSetVolumes,
void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listvolumes, const am_Error_e error));
MOCK_METHOD2(ackSinkNotificationConfiguration,
diff --git a/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl b/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl
index 912ce13..e0bfd05 100644
--- a/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl
+++ b/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl
@@ -8,8 +8,8 @@ import org.genivi.am.* from "../../AudioManagerDaemon/fidls/AudioManagerTypes.fi
interface RoutingControl {
version {
- major 0
- minor 1
+ major 1
+ minor 0
}
<**
@@ -24,17 +24,17 @@ interface RoutingControl {
<**
@description : connects a source to a sink
-(at)return E_OK on success, E_UNKNOWN on error, E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
- **>
- method asyncConnect {
- in {
- am_Handle_s handle
- am_connectionID_t connectionID
- am_sourceID_t sourceID
- am_sinkID_t sinkID
- am_ConnectionFormat_pe connectionFormat
- }
- }
+(at)return E_OK on success, E_UNKNOWN on error, E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
+ **>
+ method asyncConnect {
+ in {
+ am_Handle_s handle
+ am_connectionID_t connectionID
+ am_sourceID_t sourceID
+ am_sinkID_t sinkID
+ am_CustomConnectionFormat_t connectionFormat
+ }
+ }
<**
@description : disconnect a connection with given connectionID
@@ -50,31 +50,31 @@ interface RoutingControl {
<**
@description : this method is used to set the volume of a sink. This function is used to drive ramps, to mute or unmute or directly set the value. The difference is made through the ramptype.
(at)return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE if new volume is out of range
- **>
- method asyncSetSinkVolume {
- in {
- am_Handle_s handle
- am_sinkID_t sinkID
- am_volume_t volume
- am_RampType_pe ramp
- am_time_t time
- }
- }
+ **>
+ method asyncSetSinkVolume {
+ in {
+ am_Handle_s handle
+ am_sinkID_t sinkID
+ am_volume_t volume
+ am_CustomRampType_t ramp
+ am_time_t time
+ }
+ }
<**
@description : sets the volume of a source. This method is used to set the volume of a sink. This function is used to drive ramps, to mute or unmute or directly set the value. The difference is made through the ramptype.
(at)return E_OK on success, E_UNKNOWN on error, E_OUT_OF_RANGE if volume is out of range.
triggers the acknowledge ackSourceVolumeChange
- **>
- method asyncSetSourceVolume {
- in {
- am_Handle_s handle
- am_sourceID_t sourceID
- am_volume_t volume
- am_RampType_pe ramp
- am_time_t time
- }
- }
+ **>
+ method asyncSetSourceVolume {
+ in {
+ am_Handle_s handle
+ am_sourceID_t sourceID
+ am_volume_t volume
+ am_CustomRampType_t ramp
+ am_time_t time
+ }
+ }
<**
@description : This function is used to set the source state of a particular source.
@@ -139,16 +139,16 @@ triggers the acknowledge ackSourceVolumeChange
<**
@description : this function triggers crossfading.
(at)return E_OK on success, E_UNKNOWN on error
- **>
- method asyncCrossFade {
- in {
- am_Handle_s handle
- am_crossfaderID_t crossfaderID
- am_HotSink_e hotSink
- am_RampType_pe rampType
- am_time_t time
- }
- }
+ **>
+ method asyncCrossFade {
+ in {
+ am_Handle_s handle
+ am_crossfaderID_t crossfaderID
+ am_HotSink_e hotSink
+ am_CustomRampType_t rampType
+ am_time_t time
+ }
+ }
<**
@description : this function is used for early and late audio functions to set the domain state
diff --git a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h
index b46ba75..9aeb454 100644
--- a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h
+++ b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h
@@ -61,16 +61,16 @@ public:
* proxy wrapping methods.
*/
am_Error_e asyncAbort(const am_Handle_s handle, org::genivi::am::RoutingControlProxyBase::AsyncAbortAsyncCallback);
- am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_ConnectionFormat_e, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback);
+ am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_CustomConnectionFormat_t, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback);
am_Error_e asyncDisconnect(const am_Handle_s handle, const am_connectionID_t, org::genivi::am::RoutingControlProxyBase::AsyncDisconnectAsyncCallback);
- am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback);
- am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t , const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback);
+ am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t, const am_volume_t, const am_CustomRampType_t, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback);
+ am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t , const am_volume_t, const am_CustomRampType_t, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback);
am_Error_e asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t, const am_SourceState_e, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceStateAsyncCallback);
am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertiesAsyncCallback);
am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertyAsyncCallback);
am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertiesAsyncCallback);
am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertyAsyncCallback);
- am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t, const am_HotSink_e, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback);
+ am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t, const am_HotSink_e, const am_CustomRampType_t, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback);
am_Error_e setDomainState(const am_domainID_t, const am_DomainState_e, org::genivi::am::RoutingControlProxyBase::SetDomainStateAsyncCallback);
am_Error_e asyncSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetVolumesAsyncCallback);
am_Error_e asyncSetSinkNotificationConfiguration(const am_Handle_s handle, const am_sinkID_t, const am_NotificationConfiguration_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkNotificationConfigurationAsyncCallback);
@@ -180,16 +180,16 @@ public:
* Wrapping methods.
*/
am_Error_e asyncAbort(const am_Handle_s, org::genivi::am::RoutingControlProxyBase::AsyncAbortAsyncCallback);
- am_Error_e asyncConnect(const am_Handle_s , const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_ConnectionFormat_e, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback);
+ am_Error_e asyncConnect(const am_Handle_s , const am_connectionID_t, const am_sourceID_t, const am_sinkID_t, const am_CustomConnectionFormat_t, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback);
am_Error_e asyncDisconnect(const am_Handle_s , const am_connectionID_t, org::genivi::am::RoutingControlProxyBase::AsyncDisconnectAsyncCallback);
- am_Error_e asyncSetSinkVolume(const am_Handle_s , const am_sinkID_t, const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback);
- am_Error_e asyncSetSourceVolume(const am_Handle_s , const am_sourceID_t , const am_volume_t, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback);
+ am_Error_e asyncSetSinkVolume(const am_Handle_s , const am_sinkID_t, const am_volume_t, const am_CustomRampType_t, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback);
+ am_Error_e asyncSetSourceVolume(const am_Handle_s , const am_sourceID_t , const am_volume_t, const am_CustomRampType_t, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback);
am_Error_e asyncSetSourceState(const am_Handle_s , const am_sourceID_t, const am_SourceState_e, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceStateAsyncCallback);
am_Error_e asyncSetSinkSoundProperties(const am_Handle_s , const am_sinkID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertiesAsyncCallback);
am_Error_e asyncSetSinkSoundProperty(const am_Handle_s , const am_sinkID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkSoundPropertyAsyncCallback);
am_Error_e asyncSetSourceSoundProperties(const am_Handle_s , const am_sourceID_t, const std::vector<am_SoundProperty_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertiesAsyncCallback);
am_Error_e asyncSetSourceSoundProperty(const am_Handle_s , const am_sourceID_t, const am_SoundProperty_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSourceSoundPropertyAsyncCallback);
- am_Error_e asyncCrossFade(const am_Handle_s , const am_crossfaderID_t, const am_HotSink_e, const am_RampType_e, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback);
+ am_Error_e asyncCrossFade(const am_Handle_s , const am_crossfaderID_t, const am_HotSink_e, const am_CustomRampType_t, const am_time_t, org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback);
am_Error_e setDomainState(const am_domainID_t, const am_DomainState_e, org::genivi::am::RoutingControlProxyBase::SetDomainStateAsyncCallback);
am_Error_e asyncSetVolumes(const am_Handle_s , const std::vector<am_Volumes_s>&, org::genivi::am::RoutingControlProxyBase::AsyncSetVolumesAsyncCallback);
am_Error_e asyncSetSinkNotificationConfiguration(const am_Handle_s , const am_sinkID_t, const am_NotificationConfiguration_s&, org::genivi::am::RoutingControlProxyBase::AsyncSetSinkNotificationConfigurationAsyncCallback);
diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h
index 272b962..2c975c7 100644
--- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h
+++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCAPI.h
@@ -73,16 +73,16 @@ public:
*/
void setRoutingRundown(const uint16_t handle);
am_Error_e asyncAbort(const am_Handle_s handle);
- am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat);
+ am_Error_e asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat);
am_Error_e asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID);
- am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
- am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
+ am_Error_e asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
+ am_Error_e asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
am_Error_e asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state);
am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& listSoundProperties);
am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty);
am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& listSoundProperties);
am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty);
- am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time);
+ am_Error_e asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time);
am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState);
am_Error_e returnBusName(std::string& BusName) const;
void getInterfaceVersion(std::string& version) const;
diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h
index e30f18f..92f4190 100644
--- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h
+++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h
@@ -45,7 +45,7 @@ extern void CAmConvertCAPI2AM(const org::genivi::am::am_Handle_s &, am::am_Handl
extern void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationPayload_s & , am::am_NotificationPayload_s & );
extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_NotificationConfiguration_s> & , std::vector<am::am_NotificationConfiguration_s> & );
extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_SoundProperty_s> &, std::vector<am::am_SoundProperty_s> &);
-extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_ConnectionFormat_pe> &, std::vector<am::am_ConnectionFormat_e> & );
+extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_CustomConnectionFormat_t> &, std::vector<am::am_CustomConnectionFormat_t> & );
extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_MainSoundProperty_s> &, std::vector<am::am_MainSoundProperty_s> & );
extern void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_Volumes_s> &, std::vector<am::am_Volumes_s> & );
extern void CAmConvertCAPIVector2AM(const org::genivi::am::am_EarlyData_L &, std::vector<am::am_EarlyData_s> &);
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp
index f79c0f5..161a7b7 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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 Christian Linke
@@ -112,7 +101,7 @@ void am_Route_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) cons
outputStream << route;
}
-am_Availability_s::am_Availability_s(const am_Availability_e& availabilityValue, const am_AvailabilityReason_pe& availabilityReasonValue):
+am_Availability_s::am_Availability_s(const am_Availability_e& availabilityValue, const am_CustomAvailabilityReason_t& availabilityReasonValue):
availability(availabilityValue),
availabilityReason(availabilityReasonValue)
{
@@ -139,7 +128,7 @@ void am_Availability_s::writeToOutputStream(CommonAPI::OutputStream& outputStrea
outputStream << availabilityReason;
}
-am_ClassProperty_s::am_ClassProperty_s(const am_ClassProperty_pe& classPropertyValue, const int16_t& valueValue):
+am_ClassProperty_s::am_ClassProperty_s(const am_CustomClassProperty_t& classPropertyValue, const int16_t& valueValue):
classProperty(classPropertyValue),
value(valueValue)
{
@@ -268,7 +257,7 @@ void am_Gateway_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) co
outputStream << convertionMatrix;
}
-am_RoutingElement_s::am_RoutingElement_s(const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_domainID_t& domainIDValue, const am_ConnectionFormat_pe& connectionFormatValue):
+am_RoutingElement_s::am_RoutingElement_s(const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_domainID_t& domainIDValue, const am_CustomConnectionFormat_t& connectionFormatValue):
sourceID(sourceIDValue),
sinkID(sinkIDValue),
domainID(domainIDValue),
@@ -303,7 +292,7 @@ void am_RoutingElement_s::writeToOutputStream(CommonAPI::OutputStream& outputStr
outputStream << connectionFormat;
}
-am_SoundProperty_s::am_SoundProperty_s(const am_SoundPropertyType_pe& typeValue, const int16_t& valueValue):
+am_SoundProperty_s::am_SoundProperty_s(const am_CustomSoundPropertyType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -330,7 +319,7 @@ void am_SoundProperty_s::writeToOutputStream(CommonAPI::OutputStream& outputStre
outputStream << value;
}
-am_SystemProperty_s::am_SystemProperty_s(const am_SystemPropertyType_pe& typeValue, const int16_t& valueValue):
+am_SystemProperty_s::am_SystemProperty_s(const am_CustomSystemPropertyType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -524,7 +513,7 @@ void am_Handle_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) con
outputStream << handle;
}
-am_MainSoundProperty_s::am_MainSoundProperty_s(const am_MainSoundPropertyType_pe& typeValue, const int16_t& valueValue):
+am_MainSoundProperty_s::am_MainSoundProperty_s(const am_CustomMainSoundPropertyType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -633,7 +622,7 @@ void am_MainConnection_s::writeToOutputStream(CommonAPI::OutputStream& outputStr
outputStream << listConnectionID;
}
-am_NotificationPayload_s::am_NotificationPayload_s(const am_NotificationType_pe& typeValue, const int16_t& valueValue):
+am_NotificationPayload_s::am_NotificationPayload_s(const am_CustomNotificationType_t& typeValue, const int16_t& valueValue):
type(typeValue),
value(valueValue)
{
@@ -660,7 +649,7 @@ void am_NotificationPayload_s::writeToOutputStream(CommonAPI::OutputStream& outp
outputStream << value;
}
-am_NotificationConfiguration_s::am_NotificationConfiguration_s(const am_NotificationType_pe& typeValue, const am_NotificationStatus_e& statusValue, const int16_t& parameterValue):
+am_NotificationConfiguration_s::am_NotificationConfiguration_s(const am_CustomNotificationType_t& typeValue, const am_NotificationStatus_e& statusValue, const int16_t& parameterValue):
type(typeValue),
status(statusValue),
parameter(parameterValue)
@@ -919,7 +908,7 @@ void am_EarlyData_s::writeToOutputStream(CommonAPI::OutputStream& outputStream)
outputStream << data;
}
-am_Connection_s::am_Connection_s(const am_connectionID_t& connectionIDValue, const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_timeSync_t& delayValue, const am_ConnectionFormat_pe& connectionFormatValue):
+am_Connection_s::am_Connection_s(const am_connectionID_t& connectionIDValue, const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_timeSync_t& delayValue, const am_CustomConnectionFormat_t& connectionFormatValue):
connectionID(connectionIDValue),
sourceID(sourceIDValue),
sinkID(sinkIDValue),
@@ -958,7 +947,7 @@ void am_Connection_s::writeToOutputStream(CommonAPI::OutputStream& outputStream)
outputStream << connectionFormat;
}
-am_Volumes_s::am_Volumes_s(const am_VolumeType_e& volumeTypeValue, const am_DataType_u& volumeIDValue, const am_volume_t& volumeValue, const am_RampType_pe& rampValue, const am_time_t& timeValue):
+am_Volumes_s::am_Volumes_s(const am_VolumeType_e& volumeTypeValue, const am_DataType_u& volumeIDValue, const am_volume_t& volumeValue, const am_CustomRampType_t& rampValue, const am_time_t& timeValue):
volumeType(volumeTypeValue),
volumeID(volumeIDValue),
volume(volumeValue),
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h
index adfd7b3..8996092 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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 Christian Linke
@@ -155,7 +144,7 @@ namespace am {
/**
* product specific identifier of property
*/
- typedef uint16_t am_ClassProperty_pe;
+ typedef uint16_t am_CustomClassProperty_t;
/**
* describes class properties
*/
@@ -166,14 +155,14 @@ namespace am {
/**
* the property as enum
*/
- am_ClassProperty_pe classProperty;
+ am_CustomClassProperty_t classProperty;
/**
* the value of the property
*/
int16_t value;
am_ClassProperty_s() = default;
- am_ClassProperty_s(const am_ClassProperty_pe& classProperty, const int16_t& value);
+ am_ClassProperty_s(const am_CustomClassProperty_t& classProperty, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -246,7 +235,7 @@ namespace am {
* This project specific value gives the information about reason for reason for
* Source/Sink change
*/
- typedef uint16_t am_AvailabilityReason_pe;
+ typedef uint16_t am_CustomAvailabilityReason_t;
/**
* with the help of this enum, sinks and sources can report their availability
* state
@@ -304,10 +293,10 @@ namespace am {
* the reason for the last change. This can be used to trigger events that deal
* with state changes.
*/
- am_AvailabilityReason_pe availabilityReason;
+ am_CustomAvailabilityReason_t availabilityReason;
am_Availability_s() = default;
- am_Availability_s(const am_Availability_e& availability, const am_AvailabilityReason_pe& availabilityReason);
+ am_Availability_s(const am_Availability_e& availability, const am_CustomAvailabilityReason_t& availabilityReason);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -473,7 +462,7 @@ namespace am {
/**
* describes the different system properties. Project specific
*/
- typedef uint16_t am_SystemPropertyType_pe;
+ typedef uint16_t am_CustomSystemPropertyType_t;
/**
* struct describing system properties
*/
@@ -484,14 +473,14 @@ namespace am {
/**
* the type that is set
*/
- am_SystemPropertyType_pe type;
+ am_CustomSystemPropertyType_t type;
/**
* the value
*/
int16_t value;
am_SystemProperty_s() = default;
- am_SystemProperty_s(const am_SystemPropertyType_pe& type, const int16_t& value);
+ am_SystemProperty_s(const am_CustomSystemPropertyType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -526,7 +515,7 @@ namespace am {
/**
* Project specific sound properties.
*/
- typedef uint16_t am_SoundPropertyType_pe;
+ typedef uint16_t am_CustomSoundPropertyType_t;
/**
* This enum characterizes the data of the EarlyData_t
*/
@@ -566,14 +555,14 @@ namespace am {
/**
* the type of the property - a project specific enum
*/
- am_SoundPropertyType_pe type;
+ am_CustomSoundPropertyType_t type;
/**
* the actual value of the property
*/
int16_t value;
am_SoundProperty_s() = default;
- am_SoundProperty_s(const am_SoundPropertyType_pe& type, const int16_t& value);
+ am_SoundProperty_s(const am_CustomSoundPropertyType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -639,7 +628,7 @@ namespace am {
* Here are all SoundProperties that can be set via the CommandInterface. Product
* specific
*/
- typedef uint16_t am_MainSoundPropertyType_pe;
+ typedef uint16_t am_CustomMainSoundPropertyType_t;
/**
* struct describung mainsound property
*/
@@ -650,14 +639,14 @@ namespace am {
/**
* the type of the property
*/
- am_MainSoundPropertyType_pe type;
+ am_CustomMainSoundPropertyType_t type;
/**
* the actual value
*/
int16_t value;
am_MainSoundProperty_s() = default;
- am_MainSoundProperty_s(const am_MainSoundPropertyType_pe& type, const int16_t& value);
+ am_MainSoundProperty_s(const am_CustomMainSoundPropertyType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -675,7 +664,7 @@ namespace am {
/**
* gives the type of the Notification.
*/
- typedef uint16_t am_NotificationType_pe;
+ typedef uint16_t am_CustomNotificationType_t;
enum class am_NotificationStatus_e: int32_t {
NS_UNKNOWN = 0,
/**
@@ -717,7 +706,7 @@ namespace am {
/**
* The notification type of the notification
*/
- am_NotificationType_pe type;
+ am_CustomNotificationType_t type;
/**
* The Notification status. This can be periodic, min/max value based or even off
* for example
@@ -738,7 +727,7 @@ namespace am {
int16_t parameter;
am_NotificationConfiguration_s() = default;
- am_NotificationConfiguration_s(const am_NotificationType_pe& type, const am_NotificationStatus_e& status, const int16_t& parameter);
+ am_NotificationConfiguration_s(const am_CustomNotificationType_t& type, const am_NotificationStatus_e& status, const int16_t& parameter);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -766,7 +755,7 @@ namespace am {
* This project specific value classifies the format in which data is exchanged
* within a connection.
*/
- typedef uint16_t am_ConnectionFormat_pe;
+ typedef uint16_t am_CustomConnectionFormat_t;
/**
* This represents one "hopp" in a route
*/
@@ -789,10 +778,10 @@ namespace am {
/**
* the connectionformat that is used for the route
*/
- am_ConnectionFormat_pe connectionFormat;
+ am_CustomConnectionFormat_t connectionFormat;
am_RoutingElement_s() = default;
- am_RoutingElement_s(const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_domainID_t& domainID, const am_ConnectionFormat_pe& connectionFormat);
+ am_RoutingElement_s(const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_domainID_t& domainID, const am_CustomConnectionFormat_t& connectionFormat);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -826,7 +815,7 @@ namespace am {
* responsibility of the product to make sure that the routing plugins are aware
* of the ramp types used.
*/
- typedef uint16_t am_RampType_pe;
+ typedef uint16_t am_CustomRampType_t;
/**
* This datatype determines if a sourceID or a sinkID is used in the union
* following
@@ -868,14 +857,14 @@ namespace am {
/**
* the ramp that shall be driven
*/
- am_RampType_pe ramp;
+ am_CustomRampType_t ramp;
/**
* the time for the ramp
*/
am_time_t time;
am_Volumes_s() = default;
- am_Volumes_s(const am_VolumeType_e& volumeType, const am_DataType_u& volumeID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time);
+ am_Volumes_s(const am_VolumeType_e& volumeType, const am_DataType_u& volumeID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -890,7 +879,7 @@ namespace am {
}
};
typedef std::vector<am_Volumes_s> am_Volumes_L;
- typedef std::vector<am_ConnectionFormat_pe> am_ConnectionFormat_L;
+ typedef std::vector<am_CustomConnectionFormat_t> am_ConnectionFormat_L;
typedef bool am_bool_t;
typedef std::vector<am_bool_t> am_Convertion_L;
/**
@@ -1389,7 +1378,7 @@ namespace am {
/**
* This defines the notification type
*/
- am_NotificationType_pe type;
+ am_CustomNotificationType_t type;
/**
* This is finally the value of the notification. It's meaning depends on the
* notificationType
@@ -1397,7 +1386,7 @@ namespace am {
int16_t value;
am_NotificationPayload_s() = default;
- am_NotificationPayload_s(const am_NotificationType_pe& type, const int16_t& value);
+ am_NotificationPayload_s(const am_CustomNotificationType_t& type, const int16_t& value);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
@@ -1783,10 +1772,10 @@ namespace am {
/**
* the used connectionformat
*/
- am_ConnectionFormat_pe connectionFormat;
+ am_CustomConnectionFormat_t connectionFormat;
am_Connection_s() = default;
- am_Connection_s(const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_timeSync_t& delay, const am_ConnectionFormat_pe& connectionFormat);
+ am_Connection_s(const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_timeSync_t& delay, const am_CustomConnectionFormat_t& connectionFormat);
virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h
index 03a54a5..5cb6ccb 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -27,6 +16,7 @@
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -53,7 +43,7 @@ const char* RoutingControl::getInterfaceId() {
}
CommonAPI::Version RoutingControl::getInterfaceVersion() {
- return CommonAPI::Version(0, 1);
+ return CommonAPI::Version(1, 0);
}
@@ -68,7 +58,7 @@ namespace CommonAPI {
namespace std {
//hashes for types
-
+
//hashes for error types
}
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp
index 47904ac..e32836f 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -67,7 +56,7 @@ void RoutingControlDBusProxy::asyncAbort(const am_Handle_s& handle, CommonAPI::C
*this,
"asyncAbort",
"(iq)",
- handle,
+ handle,
callStatus
);
}
@@ -83,20 +72,20 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncAbortAsync(cons
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
-void RoutingControlDBusProxy::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_ConnectionFormat_pe>,
+void RoutingControlDBusProxy::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply(
*this,
"asyncConnect",
"(iq)qqqq",
- handle, connectionID, sourceID, sinkID, connectionFormat,
+ handle, connectionID, sourceID, sinkID, connectionFormat,
callStatus
);
}
-std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_ConnectionFormat_pe>,
+std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync(
*this,
"asyncConnect",
@@ -115,7 +104,7 @@ void RoutingControlDBusProxy::asyncDisconnect(const am_Handle_s& handle, const a
*this,
"asyncDisconnect",
"(iq)q",
- handle, connectionID,
+ handle, connectionID,
callStatus
);
}
@@ -135,18 +124,18 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncDisconnectAsync
(at)return E_OK on success, E_UNKNOWN on error,
* E_OUT_OF_RANGE if new volume is out of range
*/
-void RoutingControlDBusProxy::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_pe, am_time_t>,
+void RoutingControlDBusProxy::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply(
*this,
"asyncSetSinkVolume",
"(iq)qnqn",
- handle, sinkID, volume, ramp, time,
+ handle, sinkID, volume, ramp, time,
callStatus
);
}
-std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_pe, am_time_t>,
+std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync(
*this,
"asyncSetSinkVolume",
@@ -163,18 +152,18 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkVolumeAs
* range.
triggers the acknowledge ackSourceVolumeChange
*/
-void RoutingControlDBusProxy::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_pe, am_time_t>,
+void RoutingControlDBusProxy::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply(
*this,
"asyncSetSourceVolume",
"(iq)qnqn",
- handle, sourceID, volume, ramp, time,
+ handle, sourceID, volume, ramp, time,
callStatus
);
}
-std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_pe, am_time_t>,
+std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync(
*this,
"asyncSetSourceVolume",
@@ -193,7 +182,7 @@ void RoutingControlDBusProxy::asyncSetSourceState(const am_Handle_s& handle, con
*this,
"asyncSetSourceState",
"(iq)qi",
- handle, sourceID, state,
+ handle, sourceID, state,
callStatus
);
}
@@ -217,7 +206,7 @@ void RoutingControlDBusProxy::asyncSetSinkSoundProperties(const am_Handle_s& han
*this,
"asyncSetSinkSoundProperties",
"(iq)qa(qn)",
- handle, sinkID, listSoundProperties,
+ handle, sinkID, listSoundProperties,
callStatus
);
}
@@ -241,7 +230,7 @@ void RoutingControlDBusProxy::asyncSetSinkSoundProperty(const am_Handle_s& handl
*this,
"asyncSetSinkSoundProperty",
"(iq)q(qn)",
- handle, sinkID, soundProperty,
+ handle, sinkID, soundProperty,
callStatus
);
}
@@ -265,7 +254,7 @@ void RoutingControlDBusProxy::asyncSetSourceSoundProperties(const am_Handle_s& h
*this,
"asyncSetSourceSoundProperties",
"(iq)qa(qn)",
- handle, sourceID, listSoundProperties,
+ handle, sourceID, listSoundProperties,
callStatus
);
}
@@ -289,7 +278,7 @@ void RoutingControlDBusProxy::asyncSetSourceSoundProperty(const am_Handle_s& han
*this,
"asyncSetSourceSoundProperty",
"(iq)q(qn)",
- handle, sourceID, soundProperty,
+ handle, sourceID, soundProperty,
callStatus
);
}
@@ -307,18 +296,18 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceSoundP
(at)return E_OK on success, E_UNKNOWN on
* error
*/
-void RoutingControlDBusProxy::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_RampType_pe, am_time_t>,
+void RoutingControlDBusProxy::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
+ CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply(
*this,
"asyncCrossFade",
"(iq)qiqn",
- handle, crossfaderID, hotSink, rampType, time,
+ handle, crossfaderID, hotSink, rampType, time,
callStatus
);
}
-std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_RampType_pe, am_time_t>,
+std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) {
+ return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>,
CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync(
*this,
"asyncCrossFade",
@@ -337,7 +326,7 @@ void RoutingControlDBusProxy::setDomainState(const am_domainID_t& domainID, cons
*this,
"setDomainState",
"qi",
- domainID, domainState,
+ domainID, domainState,
callStatus
, error);
}
@@ -356,7 +345,7 @@ void RoutingControlDBusProxy::asyncSetVolumes(const am_Handle_s& handle, const a
*this,
"asyncSetVolumes",
"(iq)a(i(yv)nqn)",
- handle, volumes,
+ handle, volumes,
callStatus
);
}
@@ -375,7 +364,7 @@ void RoutingControlDBusProxy::asyncSetSinkNotificationConfiguration(const am_Han
*this,
"asyncSetSinkNotificationConfiguration",
"(iq)q(qin)",
- handle, sinkID, notificationConfiguration,
+ handle, sinkID, notificationConfiguration,
callStatus
);
}
@@ -394,7 +383,7 @@ void RoutingControlDBusProxy::asyncSetSourceNotificationConfiguration(const am_H
*this,
"asyncSetSourceNotificationConfiguration",
"(iq)q(qin)",
- handle, sourceID, notificationConfiguration,
+ handle, sourceID, notificationConfiguration,
callStatus
);
}
@@ -411,8 +400,8 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceNotifi
void RoutingControlDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
- ownVersionMajor = 0;
- ownVersionMinor = 1;
+ ownVersionMajor = 1;
+ ownVersionMinor = 0;
}
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h
index c5afaaf..f9036d4 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -66,10 +55,10 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
- virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus);
- virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback);
+ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus);
+ virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback);
/**
* disconnect a connection with given connectionID
(at)return E_OK on success,
@@ -84,8 +73,8 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p
(at)return E_OK on success, E_UNKNOWN on error,
* E_OUT_OF_RANGE if new volume is out of range
*/
- virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
- virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback);
+ virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
+ virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback);
/**
* sets the volume of a source. This method is used to set the volume of a sink.
* This function is used to drive ramps, to mute or unmute or directly set the
@@ -95,8 +84,8 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p
* range.
triggers the acknowledge ackSourceVolumeChange
*/
- virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
- virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback);
+ virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
+ virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback);
/**
* This function is used to set the source state of a particular
* source.
@@ -137,8 +126,8 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p
(at)return E_OK on success, E_UNKNOWN on
* error
*/
- virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus);
- virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback);
+ virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus);
+ virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback);
/**
* this function is used for early and late audio functions to set the domain
* state
@@ -152,13 +141,13 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p
virtual std::future<CommonAPI::CallStatus> asyncSetSinkNotificationConfigurationAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_NotificationConfiguration_s& notificationConfiguration, AsyncSetSinkNotificationConfigurationAsyncCallback callback);
virtual void asyncSetSourceNotificationConfiguration(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& notificationConfiguration, CommonAPI::CallStatus& callStatus);
virtual std::future<CommonAPI::CallStatus> asyncSetSourceNotificationConfigurationAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& notificationConfiguration, AsyncSetSourceNotificationConfigurationAsyncCallback callback);
-
+
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
private:
-
+
};
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp
index bc82420..8563781 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
#include "RoutingControlDBusStubAdapter.h"
#include <org/genivi/am/RoutingControl.h>
@@ -41,31 +30,21 @@ __attribute__((constructor)) void registerRoutingControlDBusStubAdapter(void) {
&createRoutingControlDBusStubAdapter);
}
-RoutingControlDBusStubAdapter::RoutingControlDBusStubAdapter(
- const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
- 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):
- RoutingControlDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath,
- dbusConnection, std::dynamic_pointer_cast<RoutingControlStub>(stub),
- NULL)
- {
-}
-RoutingControlDBusStubAdapter::~RoutingControlDBusStubAdapter() {
+
+RoutingControlDBusStubAdapterInternal::~RoutingControlDBusStubAdapterInternal() {
deactivateManagedInstances();
- deinit();
- stub_.reset();
+ RoutingControlDBusStubAdapterHelper::deinit();
}
-void RoutingControlDBusStubAdapter::deactivateManagedInstances() {
+void RoutingControlDBusStubAdapterInternal::deactivateManagedInstances() {
}
-const char* RoutingControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
- static const char* introspectionData =
+const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+ static const std::string introspectionData =
+ "<method name=\"getInterfaceVersion\">\n"
+ "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+ "</method>\n"
/**
* aborts an asynchronous action.
(at)return E_OK on success, E_UNKNOWN on error,
@@ -77,7 +56,7 @@ const char* RoutingControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData()
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
"<method name=\"asyncConnect\">\n"
"<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n"
@@ -211,10 +190,15 @@ const char* RoutingControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData()
"<arg name=\"sourceID\" type=\"q\" direction=\"in\" />\n"
"<arg name=\"notificationConfiguration\" type=\"(qin)\" direction=\"in\" />\n"
"</method>\n"
+
;
- return introspectionData;
+ return introspectionData.c_str();
}
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ RoutingControlStub,
+ CommonAPI::Version
+ > getRoutingControlInterfaceVersionStubDispatcher(&RoutingControlStub::getInterfaceVersion, "uu");
/**
@@ -230,11 +214,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
RoutingControlStub,
- std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_ConnectionFormat_pe>,
+ std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>,
std::tuple<>
> asyncConnectStubDispatcher(&RoutingControlStub::asyncConnect, "");
/**
@@ -256,7 +240,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
*/
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
RoutingControlStub,
- std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_pe, am_time_t>,
+ std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>,
std::tuple<>
> asyncSetSinkVolumeStubDispatcher(&RoutingControlStub::asyncSetSinkVolume, "");
/**
@@ -270,7 +254,7 @@ triggers the acknowledge ackSourceVolumeChange
*/
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
RoutingControlStub,
- std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_pe, am_time_t>,
+ std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>,
std::tuple<>
> asyncSetSourceVolumeStubDispatcher(&RoutingControlStub::asyncSetSourceVolume, "");
/**
@@ -330,7 +314,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
*/
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
RoutingControlStub,
- std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_RampType_pe, am_time_t>,
+ std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>,
std::tuple<>
> asyncCrossFadeStubDispatcher(&RoutingControlStub::asyncCrossFade, "");
/**
@@ -361,8 +345,37 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-const RoutingControlDBusStubAdapter::StubDispatcherTable& RoutingControlDBusStubAdapter::getStubDispatcherTable() {
- static const RoutingControlDBusStubAdapter::StubDispatcherTable stubDispatcherTable = {
+const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& RoutingControlDBusStubAdapterInternal::getStubDispatcherTable() {
+ return stubDispatcherTable_;
+}
+
+
+RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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):
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ RoutingControlDBusStubAdapterHelper(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ std::dynamic_pointer_cast<RoutingControlStub>(stub),
+ false),
+ stubDispatcherTable_({
/**
* aborts an asynchronous action.
(at)return E_OK on success, E_UNKNOWN on error,
@@ -372,7 +385,7 @@ const RoutingControlDBusStubAdapter::StubDispatcherTable& RoutingControlDBusStub
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
{ { "asyncConnect", "(iq)qqqq" }, &org::genivi::am::asyncConnectStubDispatcher },
/**
@@ -444,10 +457,10 @@ const RoutingControlDBusStubAdapter::StubDispatcherTable& RoutingControlDBusStub
{ { "asyncSetVolumes", "(iq)a(i(yv)nqn)" }, &org::genivi::am::asyncSetVolumesStubDispatcher },
{ { "asyncSetSinkNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::asyncSetSinkNotificationConfigurationStubDispatcher },
{ { "asyncSetSourceNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::asyncSetSourceNotificationConfigurationStubDispatcher }
- };
- return stubDispatcherTable;
-}
+ }) {
+ stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlInterfaceVersionStubDispatcher });
+}
} // namespace am
} // namespace genivi
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h
index 5efbe84..5f73bcb 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -44,9 +33,9 @@ namespace am {
typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlStub> RoutingControlDBusStubAdapterHelper;
-class RoutingControlDBusStubAdapter: public RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper {
+class RoutingControlDBusStubAdapterInternal: public RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper {
public:
- RoutingControlDBusStubAdapter(
+ RoutingControlDBusStubAdapterInternal(
const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
const std::string& commonApiAddress,
const std::string& dbusInterfaceName,
@@ -55,19 +44,49 @@ class RoutingControlDBusStubAdapter: public RoutingControlStubAdapter, public Ro
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
const std::shared_ptr<CommonAPI::StubBase>& stub);
- ~RoutingControlDBusStubAdapter();
+ ~RoutingControlDBusStubAdapterInternal();
-
- const StubDispatcherTable& getStubDispatcherTable();
-
+
+ const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
void deactivateManagedInstances();
+
protected:
virtual const char* getMethodsDBusIntrospectionXmlData() const;
private:
+ RoutingControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class RoutingControlDBusStubAdapter: public RoutingControlDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlDBusStubAdapter> {
+public:
+ RoutingControlDBusStubAdapter(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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) :
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ RoutingControlDBusStubAdapterInternal(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ stub) { }
};
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h
index 7e4c027..4fe3ad8 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -27,6 +16,7 @@
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -68,7 +58,7 @@ namespace CommonAPI {
namespace std {
//hashes for types
-
+
//hashes for error types
}
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp
index b23a0e4..9da10db 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -69,7 +58,7 @@ void RoutingControlObserverDBusProxy::ackConnect(const am_Handle_s& handle, cons
*this,
"ackConnect",
"(iq)qi",
- handle, connectionID, error,
+ handle, connectionID, error,
callStatus
);
}
@@ -91,7 +80,7 @@ void RoutingControlObserverDBusProxy::ackDisconnect(const am_Handle_s& handle, c
*this,
"ackDisconnect",
"(iq)qi",
- handle, connectionID, error,
+ handle, connectionID, error,
callStatus
);
}
@@ -113,7 +102,7 @@ void RoutingControlObserverDBusProxy::ackSetSinkVolumeChange(const am_Handle_s&
*this,
"ackSetSinkVolumeChange",
"(iq)ni",
- handle, volume, error,
+ handle, volume, error,
callStatus
);
}
@@ -135,7 +124,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceVolumeChange(const am_Handle_s
*this,
"ackSetSourceVolumeChange",
"(iq)ni",
- handle, volume, error,
+ handle, volume, error,
callStatus
);
}
@@ -157,7 +146,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceState(const am_Handle_s& handl
*this,
"ackSetSourceState",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -179,7 +168,7 @@ void RoutingControlObserverDBusProxy::ackSetSinkSoundProperties(const am_Handle_
*this,
"ackSetSinkSoundProperties",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -201,7 +190,7 @@ void RoutingControlObserverDBusProxy::ackSetSinkSoundProperty(const am_Handle_s&
*this,
"ackSetSinkSoundProperty",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -223,7 +212,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceSoundProperties(const am_Handl
*this,
"ackSetSourceSoundProperties",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -245,7 +234,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceSoundProperty(const am_Handle_
*this,
"ackSetSourceSoundProperty",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -267,7 +256,7 @@ void RoutingControlObserverDBusProxy::ackCrossFading(const am_Handle_s& handle,
*this,
"ackCrossFading",
"(iq)ii",
- handle, hotSink, error,
+ handle, hotSink, error,
callStatus
);
}
@@ -290,7 +279,7 @@ void RoutingControlObserverDBusProxy::ackSourceVolumeTick(const am_Handle_s& han
*this,
"ackSourceVolumeTick",
"(iq)qn",
- handle, sourceID, volume,
+ handle, sourceID, volume,
callStatus
);
}
@@ -313,7 +302,7 @@ void RoutingControlObserverDBusProxy::ackSinkVolumeTick(const am_Handle_s& handl
*this,
"ackSinkVolumeTick",
"(iq)qn",
- handle, sinkID, volume,
+ handle, sinkID, volume,
callStatus
);
}
@@ -340,7 +329,7 @@ void RoutingControlObserverDBusProxy::peekDomain(const std::string& name, Common
*this,
"peekDomain",
"s",
- name,
+ name,
callStatus
, domainID, error);
}
@@ -364,7 +353,7 @@ void RoutingControlObserverDBusProxy::registerDomain(const am_Domain_s& domainDa
*this,
"registerDomain",
"(qsssbbi)ss",
- domainData, returnBusname, returnInterface,
+ domainData, returnBusname, returnInterface,
callStatus
, domainID, error);
}
@@ -389,7 +378,7 @@ void RoutingControlObserverDBusProxy::deregisterDomain(const am_domainID_t& doma
*this,
"deregisterDomain",
"q",
- domainID,
+ domainID,
callStatus
, error);
}
@@ -412,7 +401,7 @@ void RoutingControlObserverDBusProxy::registerGateway(const am_Gateway_s& gatewa
*this,
"registerGateway",
"(qsqqqqqaqaqab)",
- gatewayData,
+ gatewayData,
callStatus
, gatewayID, error);
}
@@ -437,7 +426,7 @@ void RoutingControlObserverDBusProxy::deregisterGateway(const am_gatewayID_t& ga
*this,
"deregisterGateway",
"q",
- gatewayID,
+ gatewayID,
callStatus
, error);
}
@@ -464,7 +453,7 @@ void RoutingControlObserverDBusProxy::peekSink(const std::string& name, CommonAP
*this,
"peekSink",
"s",
- name,
+ name,
callStatus
, sinkID, error);
}
@@ -489,7 +478,7 @@ void RoutingControlObserverDBusProxy::registerSink(const am_Sink_s& sinkData, Co
*this,
"registerSink",
"(qsqqnb(iq)ina(qn)aqa(qn)a(qin)a(qin))",
- sinkData,
+ sinkData,
callStatus
, sinkID, error);
}
@@ -513,7 +502,7 @@ void RoutingControlObserverDBusProxy::deregisterSink(const am_sinkID_t& sinkID,
*this,
"deregisterSink",
"q",
- sinkID,
+ sinkID,
callStatus
, error);
}
@@ -540,7 +529,7 @@ void RoutingControlObserverDBusProxy::peekSource(const std::string& name, Common
*this,
"peekSource",
"s",
- name,
+ name,
callStatus
, sourceID, error);
}
@@ -566,7 +555,7 @@ void RoutingControlObserverDBusProxy::registerSource(const am_Source_s& sourceDa
*this,
"registerSource",
"(qqsqinb(iq)ia(qn)aqa(qn)a(qin)a(qin))",
- sourceData,
+ sourceData,
callStatus
, sourceID, error);
}
@@ -590,7 +579,7 @@ void RoutingControlObserverDBusProxy::deregisterSource(const am_sourceID_t& sour
*this,
"deregisterSource",
"q",
- sourceID,
+ sourceID,
callStatus
, error);
}
@@ -614,7 +603,7 @@ void RoutingControlObserverDBusProxy::registerCrossfader(const am_Crossfader_s&
*this,
"registerCrossfader",
"(qsqqqi)",
- crossfaderData,
+ crossfaderData,
callStatus
, crossfaderID, error);
}
@@ -639,7 +628,7 @@ void RoutingControlObserverDBusProxy::deregisterCrossfader(const am_crossfaderID
*this,
"deregisterCrossfader",
"q",
- crossfaderID,
+ crossfaderID,
callStatus
, error);
}
@@ -664,7 +653,7 @@ void RoutingControlObserverDBusProxy::peekSourceClassID(const std::string& name,
*this,
"peekSourceClassID",
"s",
- name,
+ name,
callStatus
, sourceClassID, error);
}
@@ -689,7 +678,7 @@ void RoutingControlObserverDBusProxy::peekSinkClassID(const std::string& name, C
*this,
"peekSinkClassID",
"s",
- name,
+ name,
callStatus
, sinkClassID, error);
}
@@ -711,7 +700,7 @@ void RoutingControlObserverDBusProxy::hookInterruptStatusChange(const am_sourceI
*this,
"hookInterruptStatusChange",
"qi",
- sourceID, interruptState,
+ sourceID, interruptState,
callStatus
);
}
@@ -735,7 +724,7 @@ void RoutingControlObserverDBusProxy::hookDomainRegistrationComplete(const am_do
*this,
"hookDomainRegistrationComplete",
"q",
- domainID,
+ domainID,
callStatus
);
}
@@ -757,7 +746,7 @@ void RoutingControlObserverDBusProxy::hookSinkAvailablityStatusChange(const am_s
*this,
"hookSinkAvailablityStatusChange",
"q(iq)",
- sinkID, availability,
+ sinkID, availability,
callStatus
);
}
@@ -779,7 +768,7 @@ void RoutingControlObserverDBusProxy::hookSourceAvailablityStatusChange(const am
*this,
"hookSourceAvailablityStatusChange",
"q(iq)",
- sourceID, availability,
+ sourceID, availability,
callStatus
);
}
@@ -801,7 +790,7 @@ void RoutingControlObserverDBusProxy::hookDomainStateChange(const am_domainID_t&
*this,
"hookDomainStateChange",
"qi",
- domainID, domainState,
+ domainID, domainState,
callStatus
);
}
@@ -823,7 +812,7 @@ void RoutingControlObserverDBusProxy::hookTimingInformationChanged(const am_conn
*this,
"hookTimingInformationChanged",
"qn",
- connectionID, delay,
+ connectionID, delay,
callStatus
);
}
@@ -847,7 +836,7 @@ void RoutingControlObserverDBusProxy::sendChangedData(const am_EarlyData_L& earl
*this,
"sendChangedData",
"a(i(yv)(yv))",
- earlyData,
+ earlyData,
callStatus
);
}
@@ -870,7 +859,7 @@ void RoutingControlObserverDBusProxy::updateGateway(const am_gatewayID_t& gatewa
*this,
"updateGateway",
"qaqaqab",
- gatewayID, listSourceFormats, listSinkFormats, convertionMatrix,
+ gatewayID, listSourceFormats, listSinkFormats, convertionMatrix,
callStatus
, error);
}
@@ -893,7 +882,7 @@ void RoutingControlObserverDBusProxy::updateSink(const am_sinkID_t& sinkID, cons
*this,
"updateSink",
"qqa(qn)aqa(qn)",
- sinkID, sinkClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties,
+ sinkID, sinkClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties,
callStatus
, error);
}
@@ -924,7 +913,7 @@ void RoutingControlObserverDBusProxy::updateSource(const am_sourceID_t& sourceID
*this,
"updateSource",
"qqa(qn)aqa(qn)",
- sourceID, sourceClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties,
+ sourceID, sourceClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties,
callStatus
, error);
}
@@ -946,7 +935,7 @@ void RoutingControlObserverDBusProxy::ackSetVolumes(const am_Handle_s& handle, c
*this,
"ackSetVolumes",
"(iq)a(i(yv)nqn)i",
- handle, listvolumes, error,
+ handle, listvolumes, error,
callStatus
);
}
@@ -968,7 +957,7 @@ void RoutingControlObserverDBusProxy::ackSinkNotificationConfiguration(const am_
*this,
"ackSinkNotificationConfiguration",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -990,7 +979,7 @@ void RoutingControlObserverDBusProxy::ackSourceNotificationConfiguration(const a
*this,
"ackSourceNotificationConfiguration",
"(iq)i",
- handle, error,
+ handle, error,
callStatus
);
}
@@ -1012,7 +1001,7 @@ void RoutingControlObserverDBusProxy::hookSinkNotificationDataChange(const am_si
*this,
"hookSinkNotificationDataChange",
"q(qn)",
- sinkID, payload,
+ sinkID, payload,
callStatus
);
}
@@ -1034,7 +1023,7 @@ void RoutingControlObserverDBusProxy::hookSourceNotificationDataChange(const am_
*this,
"hookSourceNotificationDataChange",
"q(qn)",
- sourceID, payload,
+ sourceID, payload,
callStatus
);
}
@@ -1053,7 +1042,7 @@ void RoutingControlObserverDBusProxy::confirmRoutingRundown(const std::string& d
*this,
"confirmRoutingRundown",
"s",
- domainName,
+ domainName,
callStatus
);
}
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h
index e0f2460..81d8885 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -333,14 +322,14 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx
virtual std::future<CommonAPI::CallStatus> hookSourceNotificationDataChangeAsync(const am_sourceID_t& sourceID, const am_NotificationPayload_s& payload, HookSourceNotificationDataChangeAsyncCallback callback);
virtual void confirmRoutingRundown(const std::string& domainName, CommonAPI::CallStatus& callStatus);
virtual std::future<CommonAPI::CallStatus> confirmRoutingRundownAsync(const std::string& domainName, ConfirmRoutingRundownAsyncCallback callback);
-
+
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
private:
CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusReadonlyAttribute<RoutingReadyAttribute>> routingReady_;
-
+
};
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp
index becdca1..4c8053d 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
#include "RoutingControlObserverDBusStubAdapter.h"
#include <org/genivi/am/RoutingControlObserver.h>
@@ -41,31 +30,21 @@ __attribute__((constructor)) void registerRoutingControlObserverDBusStubAdapter(
&createRoutingControlObserverDBusStubAdapter);
}
-RoutingControlObserverDBusStubAdapter::RoutingControlObserverDBusStubAdapter(
- const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
- 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):
- RoutingControlObserverDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath,
- dbusConnection, std::dynamic_pointer_cast<RoutingControlObserverStub>(stub),
- NULL)
- {
-}
-RoutingControlObserverDBusStubAdapter::~RoutingControlObserverDBusStubAdapter() {
+
+RoutingControlObserverDBusStubAdapterInternal::~RoutingControlObserverDBusStubAdapterInternal() {
deactivateManagedInstances();
- deinit();
- stub_.reset();
+ RoutingControlObserverDBusStubAdapterHelper::deinit();
}
-void RoutingControlObserverDBusStubAdapter::deactivateManagedInstances() {
+void RoutingControlObserverDBusStubAdapterInternal::deactivateManagedInstances() {
}
-const char* RoutingControlObserverDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
- static const char* introspectionData =
+const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+ static const std::string introspectionData =
+ "<method name=\"getInterfaceVersion\">\n"
+ "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+ "</method>\n"
"<method name=\"getRoutingReadyAttribute\">\n"
"<arg name=\"value\" type=\"i\" direction=\"out\" />"
"</method>\n"
@@ -461,10 +440,15 @@ const char* RoutingControlObserverDBusStubAdapter::getMethodsDBusIntrospectionXm
"<method name=\"confirmRoutingRundown\">\n"
"<arg name=\"domainName\" type=\"s\" direction=\"in\" />\n"
"</method>\n"
+
;
- return introspectionData;
+ return introspectionData.c_str();
}
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+ RoutingControlObserverStub,
+ CommonAPI::Version
+ > getRoutingControlObserverInterfaceVersionStubDispatcher(&RoutingControlObserverStub::getInterfaceVersion, "uu");
/**
* This attribute signals to the clients the current routing state.
@@ -889,7 +873,7 @@ A client
* should notify himself to this attribute in order to know the current state and
* act accordingly.
*/
-void RoutingControlObserverDBusStubAdapter::fireRoutingReadyAttributeChanged(const am_RoutingReady_e& value) {
+void RoutingControlObserverDBusStubAdapterInternal::fireRoutingReadyAttributeChanged(const am_RoutingReady_e& value) {
CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_RoutingReady_e>>
::sendSignal(
*this,
@@ -900,8 +884,37 @@ void RoutingControlObserverDBusStubAdapter::fireRoutingReadyAttributeChanged(con
}
-const RoutingControlObserverDBusStubAdapter::StubDispatcherTable& RoutingControlObserverDBusStubAdapter::getStubDispatcherTable() {
- static const RoutingControlObserverDBusStubAdapter::StubDispatcherTable stubDispatcherTable = {
+const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& RoutingControlObserverDBusStubAdapterInternal::getStubDispatcherTable() {
+ return stubDispatcherTable_;
+}
+
+
+RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAdapterInternal(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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):
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ RoutingControlObserverDBusStubAdapterHelper(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ std::dynamic_pointer_cast<RoutingControlObserverStub>(stub),
+ false),
+ stubDispatcherTable_({
/**
* This attribute signals to the clients the current routing state.
A client
@@ -1142,10 +1155,10 @@ const RoutingControlObserverDBusStubAdapter::StubDispatcherTable& RoutingControl
*/
{ { "hookSourceNotificationDataChange", "q(qn)" }, &org::genivi::am::hookSourceNotificationDataChangeStubDispatcher },
{ { "confirmRoutingRundown", "s" }, &org::genivi::am::confirmRoutingRundownStubDispatcher }
- };
- return stubDispatcherTable;
-}
+ }) {
+ stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlObserverInterfaceVersionStubDispatcher });
+}
} // namespace am
} // namespace genivi
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h
index a1ba0c6..144e86a 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -44,9 +33,9 @@ namespace am {
typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlObserverStub> RoutingControlObserverDBusStubAdapterHelper;
-class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper {
+class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper {
public:
- RoutingControlObserverDBusStubAdapter(
+ RoutingControlObserverDBusStubAdapterInternal(
const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
const std::string& commonApiAddress,
const std::string& dbusInterfaceName,
@@ -55,7 +44,7 @@ class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverStubAd
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
const std::shared_ptr<CommonAPI::StubBase>& stub);
- ~RoutingControlObserverDBusStubAdapter();
+ ~RoutingControlObserverDBusStubAdapterInternal();
/**
* This attribute signals to the clients the current routing state.
@@ -65,16 +54,46 @@ class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverStubAd
*/
void fireRoutingReadyAttributeChanged(const am_RoutingReady_e& value);
-
- const StubDispatcherTable& getStubDispatcherTable();
-
+
+ const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
void deactivateManagedInstances();
+
protected:
virtual const char* getMethodsDBusIntrospectionXmlData() const;
private:
+ RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlObserverDBusStubAdapter> {
+public:
+ RoutingControlObserverDBusStubAdapter(
+ const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+ 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) :
+ CommonAPI::DBus::DBusStubAdapter(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ false),
+ RoutingControlObserverDBusStubAdapterInternal(
+ factory,
+ commonApiAddress,
+ dbusInterfaceName,
+ dbusBusName,
+ dbusObjectPath,
+ dbusConnection,
+ stub) { }
};
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h
index 242dcf6..998e8ae 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -27,6 +16,7 @@
#include "RoutingControlObserverProxyBase.h"
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -41,11 +31,15 @@ namespace genivi {
namespace am {
template <typename ... _AttributeExtensions>
-class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtual public RoutingControlObserverProxyBase, public _AttributeExtensions... {
- public:
+class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtual public RoutingControlObserverProxyBase
+, public _AttributeExtensions... {
+public:
RoutingControlObserverProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
~RoutingControlObserverProxy();
+ typedef RoutingControlObserver InterfaceType;
+
+
/**
* This attribute signals to the clients the current routing state.
A client
@@ -1085,7 +1079,7 @@ class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtua
* It will provide the same value for CallStatus as will be handed to the callback.
*/
virtual std::future<CommonAPI::CallStatus> confirmRoutingRundownAsync(const std::string& domainName, ConfirmRoutingRundownAsyncCallback callback);
-
+
/**
* Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -1791,7 +1785,6 @@ CommonAPI::InterfaceVersionAttribute& RoutingControlObserverProxy<_AttributeExte
return delegate_->getInterfaceVersionAttribute();
}
-
} // namespace am
} // namespace genivi
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h
index d222d40..fa80989 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h
index 643b5d5..eb61414 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -61,10 +50,9 @@ class RoutingControlObserverStubAdapter: virtual public CommonAPI::StubAdapter,
///Notifies all remote listeners about a change of value of the attribute RoutingReady.
virtual void fireRoutingReadyAttributeChanged(const am_RoutingReady_e& RoutingReady) = 0;
-
-
+
+
virtual void deactivateManagedInstances() = 0;
-
protected:
/**
* Defines properties for storing the ClientIds of clients / proxies that have
@@ -99,9 +87,10 @@ class RoutingControlObserverStubRemoteEvent {
* This class and the one above are the ones an application developer needs to have
* a look at if he wants to implement a service.
*/
-class RoutingControlObserverStub : public CommonAPI::Stub<RoutingControlObserverStubAdapter , RoutingControlObserverStubRemoteEvent> {
- public:
+class RoutingControlObserverStub : public virtual CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent> {
+public:
virtual ~RoutingControlObserverStub() { }
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
/**
* This attribute signals to the clients the current routing state.
@@ -387,7 +376,10 @@ class RoutingControlObserverStub : public CommonAPI::Stub<RoutingControlObserver
virtual void hookSourceNotificationDataChange(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sourceID_t sourceID, am_NotificationPayload_s payload) = 0;
/// This is the method that will be called on remote calls on the method confirmRoutingRundown.
virtual void confirmRoutingRundown(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string domainName) = 0;
-
+
+ using CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
};
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp
index 7e0145f..46d10f7 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
#include <org/genivi/am/RoutingControlObserverStubDefault.h>
@@ -25,11 +14,16 @@ namespace genivi {
namespace am {
RoutingControlObserverStubDefault::RoutingControlObserverStubDefault():
- remoteEventHandler_(this) {
+ remoteEventHandler_(this),
+ interfaceVersion_(RoutingControlObserver::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& RoutingControlObserverStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+ return interfaceVersion_;
}
RoutingControlObserverStubRemoteEvent* RoutingControlObserverStubDefault::initStubAdapter(const std::shared_ptr<RoutingControlObserverStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
+ CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::stubAdapter_ = stubAdapter;
return &remoteEventHandler_;
}
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h
index 69eb2ce..0d19077 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* Routing Receive sendInterface description.
@@ -25,6 +14,7 @@
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_STUB_DEFAULT_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_STUB_DEFAULT_H_
+
#include <org/genivi/am/RoutingControlObserverStub.h>
#include <sstream>
@@ -42,12 +32,14 @@ namespace am {
* that would be defined for this service, and/or if you do not need any non-default
* behaviour.
*/
-class RoutingControlObserverStubDefault : public RoutingControlObserverStub {
- public:
+class RoutingControlObserverStubDefault : public virtual RoutingControlObserverStub {
+public:
RoutingControlObserverStubDefault();
RoutingControlObserverStubRemoteEvent* initStubAdapter(const std::shared_ptr<RoutingControlObserverStubAdapter>& stubAdapter);
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
virtual const am_RoutingReady_e& getRoutingReadyAttribute();
virtual const am_RoutingReady_e& getRoutingReadyAttribute(const std::shared_ptr<CommonAPI::ClientId> clientId);
virtual void setRoutingReadyAttribute(am_RoutingReady_e value);
@@ -371,9 +363,9 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub {
virtual void confirmRoutingRundown(std::string domainName);
-
- protected:
+
+protected:
/**
* This attribute signals to the clients the current routing state.
A client
@@ -382,8 +374,7 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub {
*/
virtual bool trySetRoutingReadyAttribute(am_RoutingReady_e value);
virtual bool validateRoutingReadyAttributeRequestedValue(const am_RoutingReady_e& value);
- std::shared_ptr<RoutingControlObserverStubAdapter> stubAdapter_;
- private:
+private:
class RemoteEventHandler: public RoutingControlObserverStubRemoteEvent {
public:
RemoteEventHandler(RoutingControlObserverStubDefault* defaultStub);
@@ -409,6 +400,8 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub {
* act accordingly.
*/
am_RoutingReady_e routingReadyAttributeValue_;
+
+ CommonAPI::Version interfaceVersion_;
};
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
index bc0db84..4cc1ba0 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -27,6 +16,7 @@
#include "RoutingControlProxyBase.h"
+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
#define COMMONAPI_INTERNAL_COMPILATION
#endif
@@ -39,11 +29,15 @@ namespace genivi {
namespace am {
template <typename ... _AttributeExtensions>
-class RoutingControlProxy: virtual public RoutingControl, virtual public RoutingControlProxyBase, public _AttributeExtensions... {
- public:
+class RoutingControlProxy: virtual public RoutingControl, virtual public RoutingControlProxyBase
+, public _AttributeExtensions... {
+public:
RoutingControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
~RoutingControlProxy();
+ typedef RoutingControl InterfaceType;
+
+
/**
@@ -73,7 +67,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*
* Calls asyncConnect with synchronous semantics.
*
@@ -82,7 +76,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
* will be set.
*/
- virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus);
+ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus);
/**
* Calls asyncConnect with asynchronous semantics.
*
@@ -93,7 +87,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* 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> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback);
/**
* disconnect a connection with given connectionID
(at)return E_OK on success,
@@ -132,7 +126,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
* will be set.
*/
- virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
+ virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
/**
* Calls asyncSetSinkVolume with asynchronous semantics.
*
@@ -143,7 +137,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* 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> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback);
/**
* sets the volume of a source. This method is used to set the volume of a sink.
* This function is used to drive ramps, to mute or unmute or directly set the
@@ -160,7 +154,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
* will be set.
*/
- virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
+ virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus);
/**
* Calls asyncSetSourceVolume with asynchronous semantics.
*
@@ -171,7 +165,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* 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> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback);
/**
* This function is used to set the source state of a particular
* source.
@@ -304,7 +298,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
* will be set.
*/
- virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus);
+ virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus);
/**
* Calls asyncCrossFade with asynchronous semantics.
*
@@ -315,7 +309,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* 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> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback);
+ virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback);
/**
* this function is used for early and late audio functions to set the domain
* state
@@ -401,7 +395,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing
* It will provide the same value for CallStatus as will be handed to the callback.
*/
virtual std::future<CommonAPI::CallStatus> asyncSetSourceNotificationConfigurationAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& notificationConfiguration, AsyncSetSourceNotificationConfigurationAsyncCallback callback);
-
+
/**
* Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -480,15 +474,15 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
template <typename ... _AttributeExtensions>
-void RoutingControlProxy<_AttributeExtensions...>::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus) {
+void RoutingControlProxy<_AttributeExtensions...>::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) {
delegate_->asyncConnect(handle, connectionID, sourceID, sinkID, connectionFormat, callStatus);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback) {
return delegate_->asyncConnectAsync(handle, connectionID, sourceID, sinkID, connectionFormat, callback);
}
/**
@@ -513,12 +507,12 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
* E_OUT_OF_RANGE if new volume is out of range
*/
template <typename ... _AttributeExtensions>
-void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
+void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
delegate_->asyncSetSinkVolume(handle, sinkID, volume, ramp, time, callStatus);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) {
return delegate_->asyncSetSinkVolumeAsync(handle, sinkID, volume, ramp, time, callback);
}
/**
@@ -531,12 +525,12 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
triggers the acknowledge ackSourceVolumeChange
*/
template <typename ... _AttributeExtensions>
-void RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
+void RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
delegate_->asyncSetSourceVolume(handle, sourceID, volume, ramp, time, callStatus);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) {
return delegate_->asyncSetSourceVolumeAsync(handle, sourceID, volume, ramp, time, callback);
}
/**
@@ -615,12 +609,12 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
* error
*/
template <typename ... _AttributeExtensions>
-void RoutingControlProxy<_AttributeExtensions...>::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
+void RoutingControlProxy<_AttributeExtensions...>::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) {
delegate_->asyncCrossFade(handle, crossfaderID, hotSink, rampType, time, callStatus);
}
template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) {
return delegate_->asyncCrossFadeAsync(handle, crossfaderID, hotSink, rampType, time, callback);
}
/**
@@ -705,7 +699,6 @@ CommonAPI::InterfaceVersionAttribute& RoutingControlProxy<_AttributeExtensions..
return delegate_->getInterfaceVersionAttribute();
}
-
} // namespace am
} // namespace genivi
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h
index f24ef2a..75bba47 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -81,10 +70,10 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy {
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
- virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus) = 0;
- virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback) = 0;
+ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) = 0;
+ virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback) = 0;
/**
* disconnect a connection with given connectionID
(at)return E_OK on success,
@@ -99,8 +88,8 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy {
(at)return E_OK on success, E_UNKNOWN on error,
* E_OUT_OF_RANGE if new volume is out of range
*/
- virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0;
- virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) = 0;
+ virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0;
+ virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) = 0;
/**
* sets the volume of a source. This method is used to set the volume of a sink.
* This function is used to drive ramps, to mute or unmute or directly set the
@@ -110,8 +99,8 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy {
* range.
triggers the acknowledge ackSourceVolumeChange
*/
- virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0;
- virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) = 0;
+ virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0;
+ virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) = 0;
/**
* This function is used to set the source state of a particular
* source.
@@ -152,8 +141,8 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy {
(at)return E_OK on success, E_UNKNOWN on
* error
*/
- virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0;
- virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) = 0;
+ virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0;
+ virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) = 0;
/**
* this function is used for early and late audio functions to set the domain
* state
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h
index 5458089..5303589 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -58,10 +47,9 @@ namespace am {
class RoutingControlStubAdapter: virtual public CommonAPI::StubAdapter, public RoutingControl {
public:
-
-
+
+
virtual void deactivateManagedInstances() = 0;
-
protected:
/**
* Defines properties for storing the ClientIds of clients / proxies that have
@@ -95,9 +83,10 @@ class RoutingControlStubRemoteEvent {
* This class and the one above are the ones an application developer needs to have
* a look at if he wants to implement a service.
*/
-class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , RoutingControlStubRemoteEvent> {
- public:
+class RoutingControlStub : public virtual CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent> {
+public:
virtual ~RoutingControlStub() { }
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
/**
@@ -110,10 +99,10 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
/// This is the method that will be called on remote calls on the method asyncConnect.
- virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat) = 0;
+ virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) = 0;
/**
* disconnect a connection with given connectionID
(at)return E_OK on success,
@@ -129,7 +118,7 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro
* E_OUT_OF_RANGE if new volume is out of range
*/
/// This is the method that will be called on remote calls on the method asyncSetSinkVolume.
- virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) = 0;
+ virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) = 0;
/**
* sets the volume of a source. This method is used to set the volume of a sink.
* This function is used to drive ramps, to mute or unmute or directly set the
@@ -140,7 +129,7 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro
triggers the acknowledge ackSourceVolumeChange
*/
/// This is the method that will be called on remote calls on the method asyncSetSourceVolume.
- virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) = 0;
+ virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) = 0;
/**
* This function is used to set the source state of a particular
* source.
@@ -182,7 +171,7 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro
* error
*/
/// This is the method that will be called on remote calls on the method asyncCrossFade.
- virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time) = 0;
+ virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time) = 0;
/**
* this function is used for early and late audio functions to set the domain
* state
@@ -196,7 +185,10 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro
virtual void asyncSetSinkNotificationConfiguration(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_NotificationConfiguration_s notificationConfiguration) = 0;
/// This is the method that will be called on remote calls on the method asyncSetSourceNotificationConfiguration.
virtual void asyncSetSourceNotificationConfiguration(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_NotificationConfiguration_s notificationConfiguration) = 0;
-
+
+ using CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
};
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp
index 8a6bdd9..77e34e4 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
#include <org/genivi/am/RoutingControlStubDefault.h>
@@ -25,11 +14,16 @@ namespace genivi {
namespace am {
RoutingControlStubDefault::RoutingControlStubDefault():
- remoteEventHandler_(this) {
+ remoteEventHandler_(this),
+ interfaceVersion_(RoutingControl::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& RoutingControlStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+ return interfaceVersion_;
}
RoutingControlStubRemoteEvent* RoutingControlStubDefault::initStubAdapter(const std::shared_ptr<RoutingControlStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
+ CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::stubAdapter_ = stubAdapter;
return &remoteEventHandler_;
}
@@ -50,13 +44,13 @@ void RoutingControlStubDefault::asyncAbort(am_Handle_s handle) {
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
-void RoutingControlStubDefault::asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat) {
+void RoutingControlStubDefault::asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) {
// Call old style methods in default
asyncConnect(handle, connectionID, sourceID, sinkID, connectionFormat);
}
-void RoutingControlStubDefault::asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat) {
+void RoutingControlStubDefault::asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) {
// No operation in default
}
@@ -80,11 +74,11 @@ void RoutingControlStubDefault::asyncDisconnect(am_Handle_s handle, am_connectio
(at)return E_OK on success, E_UNKNOWN on error,
* E_OUT_OF_RANGE if new volume is out of range
*/
-void RoutingControlStubDefault::asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) {
+void RoutingControlStubDefault::asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) {
// Call old style methods in default
asyncSetSinkVolume(handle, sinkID, volume, ramp, time);
}
-void RoutingControlStubDefault::asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) {
+void RoutingControlStubDefault::asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) {
// No operation in default
}
@@ -97,11 +91,11 @@ void RoutingControlStubDefault::asyncSetSinkVolume(am_Handle_s handle, am_sinkID
* range.
triggers the acknowledge ackSourceVolumeChange
*/
-void RoutingControlStubDefault::asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) {
+void RoutingControlStubDefault::asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) {
// Call old style methods in default
asyncSetSourceVolume(handle, sourceID, volume, ramp, time);
}
-void RoutingControlStubDefault::asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) {
+void RoutingControlStubDefault::asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) {
// No operation in default
}
@@ -175,11 +169,11 @@ void RoutingControlStubDefault::asyncSetSourceSoundProperty(am_Handle_s handle,
(at)return E_OK on success, E_UNKNOWN on
* error
*/
-void RoutingControlStubDefault::asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time) {
+void RoutingControlStubDefault::asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time) {
// Call old style methods in default
asyncCrossFade(handle, crossfaderID, hotSink, rampType, time);
}
-void RoutingControlStubDefault::asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time) {
+void RoutingControlStubDefault::asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time) {
// No operation in default
}
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h
index 82f4c40..f411112 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h
@@ -1,22 +1,11 @@
/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
*
-* Copyright (c) 2012 BMW
-*
-* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*
-* \copyright
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* For further information see http://www.genivi.org/.
-*
+* 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/.
*/
/**
* This class implements everything from Audiomanager -&gt; RoutingAdapter
@@ -25,6 +14,7 @@
#ifndef ORG_GENIVI_AM_Routing_Control_STUB_DEFAULT_H_
#define ORG_GENIVI_AM_Routing_Control_STUB_DEFAULT_H_
+
#include <org/genivi/am/RoutingControlStub.h>
#include <sstream>
@@ -42,12 +32,14 @@ namespace am {
* that would be defined for this service, and/or if you do not need any non-default
* behaviour.
*/
-class RoutingControlStubDefault : public RoutingControlStub {
- public:
+class RoutingControlStubDefault : public virtual RoutingControlStub {
+public:
RoutingControlStubDefault();
RoutingControlStubRemoteEvent* initStubAdapter(const std::shared_ptr<RoutingControlStubAdapter>& stubAdapter);
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
/**
* aborts an asynchronous action.
@@ -60,10 +52,10 @@ class RoutingControlStubDefault : public RoutingControlStub {
/**
* connects a source to a sink
(at)return E_OK on success, E_UNKNOWN on error,
- * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
+ * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
*/
- virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat);
- virtual void asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat);
+ virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat);
+ virtual void asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat);
/**
* disconnect a connection with given connectionID
@@ -80,8 +72,8 @@ class RoutingControlStubDefault : public RoutingControlStub {
(at)return E_OK on success, E_UNKNOWN on error,
* E_OUT_OF_RANGE if new volume is out of range
*/
- virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time);
- virtual void asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time);
+ virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time);
+ virtual void asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time);
/**
* sets the volume of a source. This method is used to set the volume of a sink.
@@ -92,8 +84,8 @@ class RoutingControlStubDefault : public RoutingControlStub {
* range.
triggers the acknowledge ackSourceVolumeChange
*/
- virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time);
- virtual void asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time);
+ virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time);
+ virtual void asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time);
/**
* This function is used to set the source state of a particular
@@ -140,8 +132,8 @@ class RoutingControlStubDefault : public RoutingControlStub {
(at)return E_OK on success, E_UNKNOWN on
* error
*/
- virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time);
- virtual void asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time);
+ virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time);
+ virtual void asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time);
/**
* this function is used for early and late audio functions to set the domain
@@ -161,11 +153,10 @@ class RoutingControlStubDefault : public RoutingControlStub {
virtual void asyncSetSourceNotificationConfiguration(am_Handle_s handle, am_sourceID_t sourceID, am_NotificationConfiguration_s notificationConfiguration);
-
- protected:
- std::shared_ptr<RoutingControlStubAdapter> stubAdapter_;
- private:
+
+protected:
+private:
class RemoteEventHandler: public RoutingControlStubRemoteEvent {
public:
RemoteEventHandler(RoutingControlStubDefault* defaultStub);
@@ -177,6 +168,8 @@ class RoutingControlStubDefault : public RoutingControlStub {
RemoteEventHandler remoteEventHandler_;
+
+ CommonAPI::Version interfaceVersion_;
};
} // namespace am
diff --git a/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp b/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp
index 94b68a1..44c1b35 100644
--- a/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp
+++ b/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp
@@ -69,7 +69,7 @@ am_Error_e rs_lookupData_s::asyncConnect(const am_Handle_s handle,
const am_connectionID_t connectionID,
const am_sourceID_t sourceID,
const am_sinkID_t sinkID,
- const am_ConnectionFormat_e connectionFormat,
+ const am_CustomConnectionFormat_t connectionFormat,
org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback callback)
{
logInfo(__PRETTY_FUNCTION__, " [ isConnected : ", isConnected(), " ]");
@@ -81,7 +81,7 @@ am_Error_e rs_lookupData_s::asyncConnect(const am_Handle_s handle,
static_cast<org::genivi::am::am_connectionID_t>(connectionID),
static_cast<org::genivi::am::am_sourceID_t>(sourceID),
static_cast<org::genivi::am::am_sinkID_t>(sinkID),
- static_cast<org::genivi::am::am_ConnectionFormat_pe>(connectionFormat),
+ static_cast<org::genivi::am::am_CustomConnectionFormat_t>(connectionFormat),
callback);
return (E_OK);
}
@@ -108,7 +108,7 @@ am_Error_e rs_lookupData_s::asyncDisconnect(const am_Handle_s handle,
am_Error_e rs_lookupData_s::asyncSetSinkVolume( const am_Handle_s handle,
const am_sinkID_t sinkID,
const am_volume_t volume,
- const am_RampType_e ramp,
+ const am_CustomRampType_t ramp,
const am_time_t time,
org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback cb)
{
@@ -120,7 +120,7 @@ am_Error_e rs_lookupData_s::asyncSetSinkVolume( const am_Handle_s handle,
mSenderProxy->asyncSetSinkVolumeAsync(myHandle,
static_cast<org::genivi::am::am_sinkID_t>(sinkID),
static_cast<org::genivi::am::am_volume_t>(volume),
- static_cast<org::genivi::am::am_RampType_pe>(ramp),
+ static_cast<org::genivi::am::am_CustomRampType_t>(ramp),
static_cast<org::genivi::am::am_time_t>(time),
cb);
return (E_OK);
@@ -131,7 +131,7 @@ am_Error_e rs_lookupData_s::asyncSetSinkVolume( const am_Handle_s handle,
am_Error_e rs_lookupData_s::asyncSetSourceVolume(const am_Handle_s handle,
const am_sourceID_t sourceID,
const am_volume_t volume,
- const am_RampType_e ramp,
+ const am_CustomRampType_t ramp,
const am_time_t time,
org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback cb)
{
@@ -143,7 +143,7 @@ am_Error_e rs_lookupData_s::asyncSetSourceVolume(const am_Handle_s handle,
mSenderProxy->asyncSetSourceVolumeAsync(myHandle,
static_cast<org::genivi::am::am_sourceID_t>(sourceID),
static_cast<org::genivi::am::am_volume_t>(volume),
- static_cast<org::genivi::am::am_RampType_pe>(ramp),
+ static_cast<org::genivi::am::am_CustomRampType_t>(ramp),
static_cast<org::genivi::am::am_time_t>(time),
cb);
return (E_OK);
@@ -258,7 +258,7 @@ am_Error_e rs_lookupData_s::asyncSetSourceSoundProperty(const am_Handle_s handle
am_Error_e rs_lookupData_s::asyncCrossFade(const am_Handle_s handle,
const am_crossfaderID_t crossfaderID,
const am_HotSink_e hotSink,
- const am_RampType_e rampType,
+ const am_CustomRampType_t rampType,
const am_time_t time,
org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback cb)
{
@@ -270,7 +270,7 @@ am_Error_e rs_lookupData_s::asyncCrossFade(const am_Handle_s handle,
mSenderProxy->asyncCrossFadeAsync(myHandle,
static_cast<org::genivi::am::am_crossfaderID_t>(crossfaderID),
static_cast<org::genivi::am::am_HotSink_e>(hotSink),
- static_cast<org::genivi::am::am_RampType_pe>(rampType),
+ static_cast<org::genivi::am::am_CustomRampType_t>(rampType),
static_cast<org::genivi::am::am_time_t>(time),
cb);
return (E_OK);
@@ -490,7 +490,7 @@ am_Error_e CAmLookupData::asyncConnect(const am_Handle_s handle,
const am_connectionID_t connectionID,
const am_sourceID_t sourceID,
const am_sinkID_t sinkID,
- const am_ConnectionFormat_e connectionFormat,
+ const am_CustomConnectionFormat_t connectionFormat,
org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback callback)
{
RSLookupDataPtr result = CAmLookupData::getValueForKey(sourceID, mMapSources);
@@ -522,7 +522,7 @@ am_Error_e CAmLookupData::asyncDisconnect(const am_Handle_s handle,
am_Error_e CAmLookupData::asyncSetSinkVolume( const am_Handle_s handle,
const am_sinkID_t sinkID,
const am_volume_t volume,
- const am_RampType_e ramp,
+ const am_CustomRampType_t ramp,
const am_time_t time,
org::genivi::am::RoutingControlProxyBase::AsyncSetSinkVolumeAsyncCallback cb)
{
@@ -538,7 +538,7 @@ am_Error_e CAmLookupData::asyncSetSinkVolume( const am_Handle_s handle,
am_Error_e CAmLookupData::asyncSetSourceVolume(const am_Handle_s handle,
const am_sourceID_t sourceID,
const am_volume_t volume,
- const am_RampType_e ramp,
+ const am_CustomRampType_t ramp,
const am_time_t time,
org::genivi::am::RoutingControlProxyBase::AsyncSetSourceVolumeAsyncCallback cb)
{
@@ -625,7 +625,7 @@ am_Error_e CAmLookupData::asyncSetSourceSoundProperty(const am_Handle_s handle,
am_Error_e CAmLookupData::asyncCrossFade(const am_Handle_s handle,
const am_crossfaderID_t crossfaderID,
const am_HotSink_e hotSink,
- const am_RampType_e rampType,
+ const am_CustomRampType_t rampType,
const am_time_t time,
org::genivi::am::RoutingControlProxyBase::AsyncCrossFadeAsyncCallback cb)
{
diff --git a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp
index b05fcc0..207437b 100644
--- a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp
+++ b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp
@@ -144,7 +144,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncAbort(const am_Handle_s handle)
});
}
-am_Error_e CAmRoutingSenderCAPI::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)
+am_Error_e CAmRoutingSenderCAPI::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat)
{
log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncConnect called");
return mLookupData.asyncConnect(handle,connectionID, sourceID, sinkID, connectionFormat, [&,handle,connectionID](const CommonAPI::CallStatus& callStatus){
@@ -172,7 +172,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncDisconnect(const am_Handle_s handle, const
});
}
-am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSinkVolume called");
return mLookupData.asyncSetSinkVolume(handle,sinkID, volume, ramp, time, [&, handle, volume](const CommonAPI::CallStatus& callStatus){
@@ -186,7 +186,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, co
});
}
-am_Error_e CAmRoutingSenderCAPI::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSenderCAPI::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
{
log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceVolume called");
return mLookupData.asyncSetSourceVolume(handle,sourceID, volume, ramp, time, [&, handle, volume](const CommonAPI::CallStatus& callStatus){
@@ -270,7 +270,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSourceSoundProperty(const am_Handle_s h
});
}
-am_Error_e CAmRoutingSenderCAPI::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmRoutingSenderCAPI::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time)
{
return mLookupData.asyncCrossFade(handle, crossfaderID, hotSink, rampType, time, [&, handle, hotSink](const CommonAPI::CallStatus& callStatus){
log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast<int16_t>(callStatus));
diff --git a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp
index e90c75a..68d360d 100644
--- a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp
+++ b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCommon.cpp
@@ -35,7 +35,7 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_Domain_s & source, am::am_Domai
void CAmConvertCAPI2AM(const org::genivi::am::am_SoundProperty_s & source, am::am_SoundProperty_s & destination)
{
- destination.type = static_cast<am::am_SoundPropertyType_e>(source.type);
+ destination.type = static_cast<am::am_CustomSoundPropertyType_t>(source.type);
destination.value = source.value;
}
@@ -52,14 +52,14 @@ void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_SoundProperty
void CAmConvertCAPI2AM(const org::genivi::am::am_MainSoundProperty_s & source, am::am_MainSoundProperty_s & destination)
{
- destination.type = static_cast<am::am_MainSoundPropertyType_e>(source.type);
+ destination.type = static_cast<am::am_CustomMainSoundPropertyType_t>(source.type);
destination.value = source.value;
}
void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationPayload_s & source, am::am_NotificationPayload_s & destination)
{
- destination.type = static_cast<am::am_NotificationType_e>(source.type);
+ destination.type = static_cast<am::am_CustomNotificationType_t>(source.type);
destination.value = source.value;
}
@@ -87,7 +87,7 @@ void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_MainSoundProp
void CAmConvertCAPI2AM(const org::genivi::am::am_NotificationConfiguration_s & source, am::am_NotificationConfiguration_s & destination)
{
- destination.type = static_cast<am::am_NotificationType_e>(source.type);
+ destination.type = static_cast<am::am_CustomNotificationType_t>(source.type);
destination.status = static_cast<am::am_NotificationStatus_e>(source.status);
destination.parameter = source.parameter;
}
@@ -103,11 +103,11 @@ void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_NotificationC
}
}
-void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_ConnectionFormat_pe> & source, std::vector<am::am_ConnectionFormat_e> & destination)
+void CAmConvertCAPIVector2AM(const std::vector<org::genivi::am::am_CustomConnectionFormat_t> & source, std::vector<am::am_CustomConnectionFormat_t> & destination)
{
destination.clear();
- for(std::vector<org::genivi::am::am_ConnectionFormat_pe>::const_iterator iter = source.begin(); iter!=source.end(); ++iter)
- destination.push_back(static_cast<am::am_ConnectionFormat_e>(*iter));
+ for(std::vector<org::genivi::am::am_CustomConnectionFormat_t>::const_iterator iter = source.begin(); iter!=source.end(); ++iter)
+ destination.push_back(static_cast<am::am_CustomConnectionFormat_t>(*iter));
}
@@ -154,7 +154,7 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_Volumes_s & source, am::am_Volu
destination.volume = source.volume;
destination.time = source.time;
destination.volumeType = static_cast<am::am_VolumeType_e>(source.volumeType);
- destination.ramp = static_cast<am::am_RampType_e>(source.ramp);
+ destination.ramp = static_cast<am::am_CustomRampType_t>(source.ramp);
}
@@ -224,7 +224,7 @@ void CAmConvertCAPI2AM(const org::genivi::am::am_EarlyData_s & source, am::am_Ea
void CAmConvertCAPI2AM(const org::genivi::am::am_Availability_s & source, am_Availability_s & destination)
{
destination.availability = static_cast<am_Availability_e&g