* some adoptins in the routinginterface

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

6 files changed, 83 insertions, 28 deletions

diff --git a/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h
index 62ad421..71b3078 100644
--- a/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h
+++ b/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h
@@ -79,6 +79,8 @@ public:
     dbus_uint16_t getUInt(DBusMessageIter& iter, bool next);
     dbus_int16_t getInt();
     dbus_int16_t getInt(DBusMessageIter& iter, bool next);
+    dbus_int32_t getInt32();
+    dbus_int32_t getInt32(DBusMessageIter& iter, bool next);
     dbus_bool_t getBool();
     dbus_bool_t getBool(DBusMessageIter& iter, bool next);
     char getByte();
@@ -87,14 +89,22 @@ public:
     double getDouble(DBusMessageIter& iter, bool next);
     char* getString();
     char* getString(DBusMessageIter& iter, bool next);
-    am::am_Availability_s getAvailability();
+    am_Availability_s getAvailability();
     std::vector<am::am_EarlyData_s> getEarlyData();
     am_Domain_s getDomainData();
     am_Source_s getSourceData();
     am_Sink_s getSinkData();
     am_Gateway_s getGatewayData();
     am_Crossfader_s getCrossfaderData();
+    am_SoundProperty_s getSoundProperty();
     am_MainSoundProperty_s getMainSoundProperty();
+    std::vector<am_ConnectionFormat_e> getListconnectionFormats();
+    std::vector<bool> getListBool();
+    std::vector<am_SoundProperty_s> getListSoundProperties();
+    std::vector<am_MainSoundProperty_s> getListMainSoundProperties();
+    am_NotificationPayload_s getNotificationPayload();
+
+
 
     /**
      * the overloaded append function appends different datatypes to the dbusmessage
diff --git a/PluginRoutingInterfaceDbus/include/CAmDbusSend.h b/PluginRoutingInterfaceDbus/include/CAmDbusSend.h
index 3f8f0a5..b95c227 100644
--- a/PluginRoutingInterfaceDbus/include/CAmDbusSend.h
+++ b/PluginRoutingInterfaceDbus/include/CAmDbusSend.h
@@ -37,15 +37,18 @@ public:
     void append(std::string string);
     void append(uint16_t integer);
     void append(int16_t integer);
+    void append(int integer);
     void append(std::vector<am_SoundProperty_s> listSoundProperties);
     void append(am_SoundProperty_s soundProperty);
     am_Error_e send();
+    am_Error_e sendAsync();
 
 private:
     DBusMessage* mpDbusMessage;
     DBusConnection* mpDbusConnection;
     DBusMessageIter mDbusMessageIter;
     DBusError mDBusError;
+    dbus_uint32_t mSerial;
 };
 }
 
diff --git a/PluginRoutingInterfaceDbus/include/IAmRoutingReceiverShadow.h b/PluginRoutingInterfaceDbus/include/IAmRoutingReceiverShadow.h
index 642ab6f..bc0cb5e 100644
--- a/PluginRoutingInterfaceDbus/include/IAmRoutingReceiverShadow.h
+++ b/PluginRoutingInterfaceDbus/include/IAmRoutingReceiverShadow.h
@@ -74,6 +74,14 @@ public:
     void sendChangedData(DBusConnection *conn, DBusMessage *msg);
     void confirmRoutingReady(DBusConnection *conn, DBusMessage *msg);
     void confirmRoutingRundown(DBusConnection *conn, DBusMessage *msg);
+    void updateGateway(DBusConnection *conn, DBusMessage *msg);
+    void updateSink(DBusConnection *conn, DBusMessage *msg);
+    void updateSource(DBusConnection *conn, DBusMessage *msg);
+    void ackSetVolumes(DBusConnection *conn, DBusMessage *msg);
+    void ackSinkNotificationConfiguration(DBusConnection *conn, DBusMessage *msg);
+    void ackSourceNotificationConfiguration(DBusConnection *conn, DBusMessage *msg);
+    void hookSinkNotificationDataChange(DBusConnection *conn, DBusMessage *msg);
+    void hookSourceNotificationDataChange(DBusConnection *conn, DBusMessage *msg);
 
     /**
      * sets the pointer to the CommandReceiveInterface and registers Callback
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">
diff --git a/PluginRoutingInterfaceDbus/include/RoutingSender.xml b/PluginRoutingInterfaceDbus/include/RoutingSender.xml
index d6fb2ea..adfc5ad 100644
--- a/PluginRoutingInterfaceDbus/include/RoutingSender.xml
+++ b/PluginRoutingInterfaceDbus/include/RoutingSender.xml
@@ -14,72 +14,62 @@
 		<arg name='connectionID' type='q' direction='in' />	
 		<arg name='sourceID' type='q' direction='in' />      				
 		<arg name='sinkID' type='q' direction='in' /> 
-		<arg name='connectionFormat' type='n' direction='in' /> 
-		<arg name='error' type='n' direction='out' />										
+		<arg name='connectionFormat' type='i' direction='in' /> 									
 	</method>    											
 	<method name='asyncDisconnect'>	
 		<arg name='handle' type='q' direction='in' />  
-		<arg name='connectionID' type='q' direction='in' />		
-		<arg name='error' type='n' direction='out' />								    				
+		<arg name='connectionID' type='q' direction='in' />									    				
 	</method>											
 	<method name='asyncSetSinkVolume'>									
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='sinkID' type='q' direction='in' />		
 		<arg name='volume' type='n' direction='in' />									
 		<arg name='ramp' type='n' direction='in' />					
-		<arg name='time' type='q' direction='in' />	
-		<arg name='error' type='n' direction='out' />					
+		<arg name='time' type='q' direction='in' />					
 	</method>											
 	<method name='asyncSetSourceVolume'>	  							
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='sourceID' type='q' direction='in' />		
 		<arg name='volume' type='n' direction='in' />									
 		<arg name='ramp' type='n' direction='in' />					
-		<arg name='time' type='q' direction='in' />	
-		<arg name='error' type='n' direction='out' />					
+		<arg name='time' type='q' direction='in' />					
 	</method>		
 	<method name='asyncSetSourceState'>	
 		<arg name='handle' type='q' direction='in' />  
 		<arg name='sourceID' type='q' direction='in' />	
-		<arg name='sourceState' type='n' direction='in' />	
-		<arg name='error' type='n' direction='out' />								    				
+		<arg name='sourceState' type='i' direction='in' />									    				
 	</method>						
 	<method name='asyncSetSinkSoundProperties'>								
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='sinkID' type='q' direction='in' />				
-		<arg name='listSoundProperties' type='a(nn)' direction='in' />				
-		<arg name='error' type='n' direction='out' />				
+		<arg name='listSoundProperties' type='a(nn)' direction='in' />						
 	</method>	
 		<method name='asyncSetSinkSoundProperty'>								
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='sinkID' type='q' direction='in' />				
-		<arg name='soundProperty' type='(nn)' direction='in' />				
-		<arg name='error' type='n' direction='out' />				
+		<arg name='soundProperty' type='(nn)' direction='in' />							
 	</method>	
 	<method name='asyncSetSourceSoundProperty'>								
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='sourceID' type='q' direction='in' />				
-		<arg name='soundProperty' type='(nn)' direction='in' />				
-		<arg name='error' type='n' direction='out' />				
+		<arg name='soundProperty' type='(nn)' direction='in' />						
 	</method>	
 	<method name='asyncSetSourceSoundProperties'>								
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='sourceID' type='q' direction='in' />				
-		<arg name='listSoundProperties' type='a(nn)' direction='in' />				
-		<arg name='error' type='n' direction='out' />				
+		<arg name='listSoundProperties' type='a(nn)' direction='in' />							
 	</method>	
 	<method name='asyncCrossFade'>								
 		<arg name='handle' type='q' direction='in' />      				
 		<arg name='crossfaderID' type='q' direction='in' />				
 		<arg name='hotSink' type='q' direction='in' />			
 		<arg name='rampType' type='q' direction='in' />		
-		<arg name='time' type='q' direction='in' />		
-		<arg name='error' type='n' direction='out' />				
+		<arg name='time' type='q' direction='in' />				
 	</method>		
 	<method name='setDomainState'>								
 		<arg name='domainID' type='q' direction='in' />				
 		<arg name='domainState' type='q' direction='in' />			
-		<arg name='error' type='n' direction='out' />				
+		<arg name='error' type='i' direction='out' />				
 	</method>		                                                                                
 	</interface>																							
 </node>
diff --git a/PluginRoutingInterfaceDbus/include/configRoutingDbus.h b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h
index 2420184..aa95328 100644
--- a/PluginRoutingInterfaceDbus/include/configRoutingDbus.h
+++ b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h
@@ -1,6 +1,6 @@
 #ifndef _ROUTINGDBUS_CONFIG_H
 #define _ROUTINGDBUS_CONFIG_H
 
-#define ROUTING_DBUS_INTROSPECTION_FILE "/home/christian/workspace/AudioManager/bin/RoutingReceiver.xml"
+#define ROUTING_DBUS_INTROSPECTION_FILE "/home/genius/workspace/workspace/AudioManager/bin/RoutingReceiver.xml"
 
 #endif /* _ROUTINGDBUS_CONFIG_H */