diff options
author | Christian Linke <christian.linke@bmw.de> | 2013-01-17 12:47:00 +0100 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2013-01-17 12:47:00 +0100 |
commit | 3a1086516a5edf30b3bad6a2e138b03bc0479005 (patch) | |
tree | cfd926004a75be5de643a5a095ca34dafdc861d1 /PluginCommandInterfaceDbus/include | |
parent | 0269a33680a25e5d682761e8af434611cb28d00c (diff) | |
download | audiomanager-3a1086516a5edf30b3bad6a2e138b03bc0479005.tar.gz |
* changes that follow the review comments from Thomas G.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'PluginCommandInterfaceDbus/include')
3 files changed, 9 insertions, 9 deletions
diff --git a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h index d8a2a0c..2394a91 100644 --- a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h +++ b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h @@ -67,10 +67,10 @@ public: void getInterfaceVersion(std::string& version) const; void cbSinkUpdated(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties); void cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties); - void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification); - void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification); - void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); - void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); + void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) ; + void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) ; + void cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; + void cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; #ifdef UNIT_TEST friend class CAmCommandSenderDbusBackdoor; diff --git a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h index 582bf51..8360bff 100644 --- a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h +++ b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h @@ -80,7 +80,7 @@ public: double getDouble(); char* getString(); void getProperty(dbus_int16_t& type, dbus_int16_t& value); - void getNotificationConfiguration(dbus_int16_t& notificationType, dbus_int16_t& notificationStatus, dbus_int16_t& notificationParameter); + void getNotificationConfiguration(dbus_int16_t& type, dbus_int16_t& status, dbus_int16_t& parameter); /** * the overloaded append function appends different datatypes to the dbusmessage diff --git a/PluginCommandInterfaceDbus/include/CommandInterface.xml b/PluginCommandInterfaceDbus/include/CommandInterface.xml index 5eb51c7..294a92a 100644 --- a/PluginCommandInterfaceDbus/include/CommandInterface.xml +++ b/PluginCommandInterfaceDbus/include/CommandInterface.xml @@ -103,13 +103,13 @@ <method name="GetListSinkMainNotificationConfigurations">
<arg type="q" name="sinkID" direction="in"/>
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nnn)" name="listMainNotificationConfigurations" direction="out"/> <!-- am_am_notification_e type; am_NotificationStatus_e status; int16t parameter; -->
+ <arg type="a(nnn)" name="listMainNotificationConfigurations" direction="out"/> <!-- am_am_notification_e type; am_status_e status; int16t parameter; -->
</method>
<method name="GetListSourceMainNotificationConfigurations">
<arg type="q" name="sourceID" direction="in"/>
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nnn)" name="listMainNotificationConfigurations" direction="out"/> <!-- am_am_notification_e type; am_NotificationStatus_e status; int16t parameter; -->
+ <arg type="a(nnn)" name="listMainNotificationConfigurations" direction="out"/> <!-- am_am_notification_e type; am_status_e status; int16t parameter; -->
</method>
<signal name="NumberOfMainConnectionsChanged"></signal>
@@ -204,12 +204,12 @@ <signal name="SinkMainNotificationConfigurationChanged">
<arg type="q" name="sinkID" direction="out"/>
- <arg type="(nnn)" name="mainNotificationConfiguration" direction="out"/> <!-- am_am_notification_e type; am_NotificationStatus_e status; int16t parameter; -->
+ <arg type="(nnn)" name="mainNotificationConfiguration" direction="out"/> <!-- am_am_notification_e type; am_status_e status; int16t parameter; -->
</signal>
<signal name="SourceMainNotificationConfigurationChanged">
<arg type="q" name="sourceID" direction="out"/>
- <arg type="(nnn)" name="mainNotificationConfiguration" direction="out"/> <!-- am_am_notification_e type; am_NotificationStatus_e status; int16t parameter; -->
+ <arg type="(nnn)" name="mainNotificationConfiguration" direction="out"/> <!-- am_am_notification_e type; am_status_e status; int16t parameter; -->
</signal>
</interface>
|