diff options
Diffstat (limited to 'PluginCommandInterfaceDbus/include')
5 files changed, 70 insertions, 13 deletions
diff --git a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h index cb3edcc..d8a2a0c 100644 --- a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h +++ b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h @@ -65,6 +65,12 @@ public: void cbSystemPropertyChanged(const am_SystemProperty_s& systemProperty); void cbTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time); 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); #ifdef UNIT_TEST friend class CAmCommandSenderDbusBackdoor; diff --git a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h index 4cada87..582bf51 100644 --- a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h +++ b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h @@ -80,6 +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); /** * the overloaded append function appends different datatypes to the dbusmessage @@ -101,6 +102,9 @@ public: void append(const std::vector<am::am_SourceClass_s>& listSourceClasses); void append(const std::vector<am::am_SinkClass_s>& listSinkClasses); void append(const std::vector<am::am_SystemProperty_s>& listSystemProperties); + void append(const std::vector<am::am_NotificationConfiguration_s>& listNotifications); + void append(const am::am_NotificationPayload_s& notificationPayload); + void append(const am::am_NotificationConfiguration_s& notificationConfiguration); private: diff --git a/PluginCommandInterfaceDbus/include/CommandInterface.xml b/PluginCommandInterfaceDbus/include/CommandInterface.xml index f6f07a0..5eb51c7 100644 --- a/PluginCommandInterfaceDbus/include/CommandInterface.xml +++ b/PluginCommandInterfaceDbus/include/CommandInterface.xml @@ -5,7 +5,6 @@ <node>
<interface name="org.genivi.audiomanager.CommandInterface">
-
<method name="Connect">
<arg type="q" name="sourceID" direction="in"/>
<arg type="q" name="sinkID" direction="in"/>
@@ -92,7 +91,7 @@ <method name="GetListSystemProperties">
<arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
- <arg type="a(nn)" name="listSystemProperties" direction="in"/> <!-- am_SystemProperty_e type; int16_t value; -->
+ <arg type="a(nn)" name="listSystemProperties" direction="out"/> <!-- am_SystemProperty_e type; int16_t value; -->
</method>
<method name="GetTimingInformation">
@@ -100,24 +99,35 @@ <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->
<arg type="n" name="delay" direction="out"/>
</method>
+
+ <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; -->
+ </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; -->
+ </method>
- <signal name="NumberOfMainConnectionsChanged">
- </signal>
+ <signal name="NumberOfMainConnectionsChanged"></signal>
- <signal name="SinkAdded">
- <arg type="(qs(nn)nnq)" name="newSink" direction="out"/><!-- am_sinkID_t sinkID; std::string name; am_Availability_s availability; am_mainVolume_t volume; am_MuteState_e muteState; am_sinkClass_t sinkClassID; -->
+ <signal name="SinkAdded">
+ <arg type="(qs(nn)nnq)" name="newSink" direction="out"/> <!-- am_sinkID_t sinkID; std::string name; am_Availability_s availability; am_mainVolume_t volume; am_MuteState_e muteState; am_sinkClass_t sinkClassID; -->
</signal>
- <signal name="SinkRemoved">
+ <signal name="SinkRemoved">
<arg type="q" name="removedSinkID" direction="out"/>
</signal>
- <signal name="SourceAdded">
- <arg type="(qs(nn)q)" name="newSource" direction="out"/><!-- am_sourceID_t sourceID; std::string name; am_Availability_s availability; am_sourceClass_t sourceClassID; -->
+ <signal name="SourceAdded">
+ <arg type="(qs(nn)q)" name="newSource" direction="out"/> <!-- am_sourceID_t sourceID; std::string name; am_Availability_s availability; am_sourceClass_t sourceClassID; -->
</signal>
- <signal name="SourceRemoved">
- <arg type="q" name="removedSourceID" direction="out"/>
+ <signal name="SourceRemoved">
+ <arg type="q" name="removedSourceID" direction="out"/>
</signal>
<signal name="NumberOfSinkClassesChanged">
@@ -169,6 +179,38 @@ <arg type="q" name="mainConnection" direction="out"/>
<arg type="n" name="time" direction="out"/>
</signal>
-
+
+ <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; -->
+ </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; -->
+ </signal>
+
+ <signal name="SourceNotification">
+ <arg type="q" name="sourceID" direction="out"/>
+ <arg type="(nn)" name="notificationPayload" direction="out"/> <!-- am_notification_e type; int16_t value; -->
+ </signal>
+
+ <signal name="SinkNotification">
+ <arg type="q" name="sinkID" direction="out"/>
+ <arg type="(nn)" name="notificationPayload" direction="out"/> <!-- am_notification_e type; int16_t value; -->
+ </signal>
+
+ <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; -->
+ </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; -->
+ </signal>
+
</interface>
</node>
diff --git a/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h b/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h index 758266d..c582ee6 100644 --- a/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h +++ b/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h @@ -59,6 +59,10 @@ public: void getListSinkClasses(DBusConnection *conn, DBusMessage *msg); void getListSystemProperties(DBusConnection *conn, DBusMessage *msg); void getTimingInformation(DBusConnection *conn, DBusMessage *msg); + void getListSinkMainNotificationConfigurations(DBusConnection *conn, DBusMessage *msg); + void getListSourceMainNotificationConfigurations(DBusConnection *conn, DBusMessage *msg); + void setSinkMainNotificationConfiguration(DBusConnection *conn, DBusMessage *msg); + void setSourceMainNotificationConfiguration(DBusConnection *conn, DBusMessage *msg); /** * sets the pointer to the CommandReceiveInterface and registers Callback diff --git a/PluginCommandInterfaceDbus/include/configCommandDbus.h b/PluginCommandInterfaceDbus/include/configCommandDbus.h index 685d911..369beea 100644 --- a/PluginCommandInterfaceDbus/include/configCommandDbus.h +++ b/PluginCommandInterfaceDbus/include/configCommandDbus.h @@ -1,6 +1,7 @@ #ifndef _COMMANDDBUS_CONFIG_H #define _COMMANDDBUS_CONFIG_H -#define COMMAND_DBUS_INTROSPECTION_FILE "/usr/share/audiomanager/CommandInterface.xml" +#define COMMAND_DBUS_INTROSPECTION_FILE "/home/christian/workspace/AudioManager/bin/CommandInterface.xml" +#define LIBRARY_OUTPUT_PATH "/home/christian/workspace/AudioManager/bin/plugins/command" #endif /* _COMMANDDBUS_CONFIG_H */ |