diff options
author | Nrusingh Dash <ndash@jp.adit-jv.com> | 2013-02-26 23:56:44 +0900 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2013-02-27 12:32:41 +0100 |
commit | c25c9b1947474153ff34d8363b2c9e28cad78857 (patch) | |
tree | 6eb2ec71f19eb14f42cfc9cea2637d8850608d23 /PluginRoutingInterfaceDbus/include | |
parent | 52a7016213c39ec4ffdb79826ab407ce40ba5749 (diff) | |
download | audiomanager-c25c9b1947474153ff34d8363b2c9e28cad78857.tar.gz |
- changed domainData, sourceData, sinkData, gatewayData, crossfaderData to D-Bus Struct - confirmRoutingReady, confirmRoutingRundown, hookDomainRegistrationComplete should reply even return type on D-Bus is void - to parse domainID "getUInt" is used instead of "getInt"
Signed-off-by: Nrusingh Dash <ndash@jp.adit-jv.com>
Diffstat (limited to 'PluginRoutingInterfaceDbus/include')
-rw-r--r-- | PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h | 1 | ||||
-rw-r--r-- | PluginRoutingInterfaceDbus/include/RoutingReceiver.xml | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h index 03d9eca..62ad421 100644 --- a/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h +++ b/PluginRoutingInterfaceDbus/include/CAmDbusMessageHandler.h @@ -93,6 +93,7 @@ public: am_Source_s getSourceData(); am_Sink_s getSinkData(); am_Gateway_s getGatewayData(); + am_Crossfader_s getCrossfaderData(); am_MainSoundProperty_s getMainSoundProperty(); /** diff --git a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml index 76f998d..5fb390a 100644 --- a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml +++ b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml @@ -66,7 +66,7 @@ <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="(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="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 --> @@ -78,7 +78,7 @@ <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="(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="gatewayID" type="q" direction="out" /> <arg name="error" type="q" direction="out" /> </method> @@ -92,7 +92,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="(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="sinkID" type="q" direction="out" /> <arg name="error" type="q" direction="out" /> </method> @@ -106,7 +106,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="(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="sourceID" type="q" direction="out" /> <arg name="error" type="i" direction="out" /> </method> @@ -115,7 +115,7 @@ <arg name="error" type="i" direction="out" /> </method> <method name="registerCrossfader"> - <arg name="crossfaderData" type="qsqqqq" direction="in" /> <!-- am_crossfaderID_t crossfaderID; std::string name; am_sinkID_t sinkID_A; am_sinkID_t sinkID_B; am_sourceID_t sourceID; am_HotSink_e hotSink; --> + <arg name="crossfaderData" type="(qsqqqq)" direction="in" /> <!-- am_crossfaderID_t crossfaderID; std::string name; am_sinkID_t sinkID_A; am_sinkID_t sinkID_B; am_sourceID_t sourceID; am_HotSink_e hotSink; --> <arg name="crossfaderID" type="q" direction="out" /> <arg name="error" type="i" direction="out" /> </method> |