* some adoptins in the routinginterface

Signed-off-by: Christian Linke <christian.linke@bmw.de>

1 files changed, 49 insertions, 5 deletions

diff --git a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml
index 5fb390a..f8799c6 100644
--- a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml
+++ b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml
@@ -66,19 +66,21 @@
 		<arg name="error" type="q" direction="out" />
 	</method>
 	<method name="registerDomain">
-		<arg name="domaindata" type="(qsssbbq)" direction="in" /> <!-- am_domainID_t domainID; std::string name; std::string busname; std::string nodename; bool early; bool complete; am_DomainState_e state; -->
+		<arg name="domaindata" type="(qsssbbn)" direction="in" /> <!-- am_domainID_t domainID; std::string name; std::string busname; std::string nodename; bool early; bool complete; am_DomainState_e state; -->
 		<arg name="returnBusname" type="s" direction="in" /> <!-- the busname for all communication to this domain -->
 		<arg name="returnPath" type="s" direction="in" /> <!-- the path for all communication to this domain -->
 		<arg name="returnInterface" type="s" direction="in" />  <!-- the interface for all communication to this domain -->
 		<arg name="domainid" type="q" direction="out" />
 		<arg name="error" type="q" direction="out" />
 	</method>
-	<method name="deregisterDomain">
+	<method name="deregisterDomain">		
+		<arg name="handle" type="q" direction="in" />
+		<arg name="error" type="q" direction="in" />
 		<arg name="domainid" type="q" direction="in" />
 		<arg name="error" type="q" direction="out" />
 	</method>
 	<method name="registerGateway">
-		<arg name="gatewayData" type="(qsqqqqqa(q)a(q)a(b))" direction="in" /> <!-- am_gatewayID_t gatewayID; std::string name; am_sinkID_t sinkID; am_sourceID_t sourceID; am_domainID_t domainSinkID; am_domainID_t domainSourceID; am_domainID_t controlDomainID; std::vector<am_ConnectionFormat_e> listSourceFormats; std::vector<am_ConnectionFormat_e> listSinkFormats; std::vector<bool> convertionMatrix; -->
+		<arg name="gatewayData" type="(qsqqqqqaiaiab)" direction="in" /> <!-- am_gatewayID_t gatewayID; std::string name; am_sinkID_t sinkID; am_sourceID_t sourceID; am_domainID_t domainSinkID; am_domainID_t domainSourceID; am_domainID_t controlDomainID; std::vector<am_ConnectionFormat_e> listSourceFormats; std::vector<am_ConnectionFormat_e> listSinkFormats; std::vector<bool> convertionMatrix; -->
 		<arg name="gatewayID" type="q" direction="out" />
 		<arg name="error" type="q" direction="out" />
 	</method>
@@ -92,7 +94,7 @@
 	    <arg name="error" type="q" direction="out" />
 	</method>
 	<method name="registerSink">      
-		<arg name="sinkData" type="(qsqqnb(nn)nna(nn)ana(nn))" direction="in" /> <!-- am_sinkID_t sinkID; std::string name; am_domainID_t domainID; am_sinkClass_t sinkClassID; am_volume_t volume; bool visible; am_Availability_s available; am_MuteState_e muteState;am_mainVolume_t mainVolume; std::vector<am_SoundProperty_s> listSoundProperties; std::vector<am_ConnectionFormat_e> listConnectionFormats;  std::vector<am_MainSoundProperty_s> listMainSoundProperties; -->     
+		<arg name="sinkData" type="(qsqinb(ii)nna(in)aia(in)a(iin)a(iin))" direction="in" /> <!-- am_sinkID_t sinkID; std::string name; am_domainID_t domainID; am_sinkClass_t sinkClassID; am_volume_t volume; bool visible; am_Availability_s available; am_MuteState_e muteState;am_mainVolume_t mainVolume; std::vector<am_SoundProperty_s> listSoundProperties; std::vector<am_ConnectionFormat_e> listConnectionFormats;  std::vector<am_MainSoundProperty_s> listMainSoundProperties; -->     
 		<arg name="sinkID" type="q" direction="out" /> 
 		<arg name="error" type="q" direction="out" />
 	</method>
@@ -106,7 +108,7 @@
 		<arg name="error" type="i" direction="out" />		
 	</method>
 	<method name="registerSource">      
-		<arg name="sourceData" type="(qqsqqnb(nn)qa(nn)ana(nn))" direction="in" />  <!-- am_sourceID_t sourceID; am_domainID_t domainID; std::string name; am_sourceClass_t sourceClassID; am_SourceState_e sourceState; am_volume_t volume; bool visible; am_Availability_s available; am_InterruptState_e interruptState; std::vector<am_SoundProperty_s> listSoundProperties; std::vector<am_ConnectionFormat_e> listConnectionFormats; std::vector<am_MainSoundProperty_s> listMainSoundProperties; -->    
+		<arg name="sourceData" type="(qqsqinb(ii)qa(in)aia(in)a(iin)a(iin))" direction="in" />  <!-- am_sourceID_t sourceID; am_domainID_t domainID; std::string name; am_sourceClass_t sourceClassID; am_SourceState_e sourceState; am_volume_t volume; bool visible; am_Availability_s available; am_InterruptState_e interruptState; std::vector<am_SoundProperty_s> listSoundProperties; std::vector<am_ConnectionFormat_e> listConnectionFormats; std::vector<am_MainSoundProperty_s> listMainSoundProperties; -->    
 		<arg name="sourceID" type="q" direction="out" /> 
 		<arg name="error" type="i" direction="out" />
 	</method>
@@ -166,6 +168,48 @@
 	<method name="confirmRoutingRundown"> 
 		<arg name="domainID" type="q" direction="in" />
 	</method>
+	<method name="updateGateway"> 
+ 		<arg name="gatewayID" type="q" direction="in" />
+ 		<arg name="listSourceFormats" type="a(q)" direction="in" />
+		<arg name="listSinkFormats" type="a(q)" direction="in" />
+		<arg name="conversionMatrix" type="a(b)" direction="in" /> 
+	</method>
+	<method name="updateSink"> 
+ 		<arg name="sinkID" type="q" direction="in" />
+ 		<arg name="sinkClassID" type="q" direction="in" />
+ 		<arg name="listSoundProperties" type="a(nn)" direction="in" />
+		<arg name="listConnectionFormats" type="a(q)" direction="in" />  		
+ 		<arg name="listMainSoundProperties" type="a(nn)" direction="in" />
+	</method>	
+	<method name="updateSource"> 
+ 		<arg name="sourceID" type="q" direction="in" />
+ 		<arg name="sourceClassID" type="q" direction="in" />
+ 		<arg name="listSoundProperties" type="a(nn)" direction="in" />
+		<arg name="listConnectionFormats" type="a(q)" direction="in" />  		
+ 		<arg name="listMainSoundProperties" type="a(nn)" direction="in" />
+	</method>		
+	<method name="ackSetVolumes"> 
+ 		<arg name="handle" type="q" direction="in" />
+ 		<arg name="listvolumes" type="a(nqqnq)" direction="in" />
+		<arg name="error" type="q" direction="in" /> 
+	</method>		
+	<method name="ackSinkNotificationConfiguration"> 
+		<arg name="handle" type="q" direction="in" />
+		<arg name="error" type="q" direction="in" />
+	</method>		
+	<method name="ackSourceNotificationConfiguration"> 
+		<arg name="handle" type="q" direction="in" />
+		<arg name="error" type="q" direction="in" />
+	</method>		
+	<method name="hookSinkNotificationDataChange"> 
+		<arg name="sinkID" type="q" direction="in" />  
+		<arg name="payload" type="(nn)" direction="in" />
+	</method>		
+	<method name="hookSourceNotificationDataChange"> 
+		<arg name="sourceID" type="q" direction="in" />  
+		<arg name="payload" type="(nn)" direction="in" />
+	</method>		  
+
 	<signal name="setRoutingReady">
 	</signal>	
 	<signal name="setRoutingRundown">