X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.h;h=929588b8a54e62ad75e85e0b12a04f4cffa2fb35;hb=fb79b01e7bcea0876b2e62da67e9ca12b5458349;hp=0e2e133ad089508971fa88d0d4e1cbf049d47a19;hpb=319597fdda9cc7b0888750549cc7fa35cf87a26d;p=vlc

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index 0e2e133ad0..929588b8a5 100644
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -22,6 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+/* MPRIS VERSION */
+#define VLC_MPRIS_VERSION_MAJOR     1
+#define VLC_MPRIS_VERSION_MINOR     0
+
 /* DBUS IDENTIFIERS */
 
 /* name registered on the session bus */
@@ -33,7 +37,6 @@
 
 /* MACROS */
 
-/* DBus related */
 #define DBUS_METHOD( method_function ) \
     static DBusHandlerResult method_function \
             ( DBusConnection *p_conn, DBusMessage *p_from, void *p_this )
@@ -95,6 +98,11 @@ const char* psz_introspection_xml_data_root =
 "    <method name=\"Identity\">\n"
 "      <arg type=\"s\" direction=\"out\" />\n"
 "    </method>\n"
+"    <method name=\"MprisVersion\">\n"
+"      <arg type=\"(qq)\" direction=\"out\" />\n"
+"    </method>\n"
+"    <method name=\"Quit\">\n"
+"    </method>\n"
 "  </interface>\n"
 "</node>\n"
 ;
@@ -110,9 +118,7 @@ const char* psz_introspection_xml_data_player =
 "  </interface>\n"
 "  <interface name=\"org.freedesktop.MediaPlayer\">\n"
 "    <method name=\"GetStatus\">\n"
-"      <arg type=\"i\" direction=\"out\" />\n"
-"    </method>\n"
-"    <method name=\"Quit\">\n"
+"      <arg type=\"(iiii)\" direction=\"out\" />\n"
 "    </method>\n"
 "    <method name=\"Prev\">\n"
 "    </method>\n"
@@ -142,11 +148,14 @@ const char* psz_introspection_xml_data_player =
 "    <method name=\"GetMetadata\">\n"
 "      <arg type=\"a{sv}\" direction=\"out\" />\n"
 "    </method>\n"
+"    <method name=\"GetCaps\">\n"
+"      <arg type=\"i\" direction=\"out\" />\n"
+"    </method>\n"
 "    <signal name=\"TrackChange\">\n"
 "      <arg type=\"a{sv}\"/>\n"
 "    </signal>\n"
 "    <signal name=\"StatusChange\">\n"
-"      <arg type=\"i\"/>\n"
+"      <arg type=\"(iiii)\"/>\n"
 "    </signal>\n"
 "    <signal name=\"CapsChange\">\n"
 "      <arg type=\"i\"/>\n"
@@ -168,6 +177,7 @@ const char* psz_introspection_xml_data_tracklist =
 "    <method name=\"AddTrack\">\n"
 "      <arg type=\"s\" direction=\"in\" />\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
+"      <arg type=\"i\" direction=\"out\" />\n"
 "    </method>\n"
 "    <method name=\"DelTrack\">\n"
 "      <arg type=\"i\" direction=\"in\" />\n"
@@ -182,36 +192,36 @@ const char* psz_introspection_xml_data_tracklist =
 "    <method name=\"GetLength\">\n"
 "      <arg type=\"i\" direction=\"out\" />\n"
 "    </method>\n"
-"    <method name=\"Loop\">\n"
+"    <method name=\"SetLoop\">\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
 "    </method>\n"
-"    <method name=\"Random\">\n"
+"    <method name=\"SetRandom\">\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
 "    </method>\n"
+"    <signal name=\"TrackListChange\">\n"
+"      <arg type=\"i\" />\n"
+"    </signal>\n"
 "  </interface>\n"
 "</node>\n"
 ;
 
-#define MPRIS_DBUS_ROOT_PATH      "/"
-#define MPRIS_DBUS_PLAYER_PATH    "/Player"
-#define MPRIS_DBUS_TRACKLIST_PATH "/TrackList"
 
 /* Handle  messages reception */
 DBUS_METHOD( handle_root );
 DBUS_METHOD( handle_player );
 DBUS_METHOD( handle_tracklist );
 
-static DBusObjectPathVTable vlc_dbus_root_vtable = {
+static const DBusObjectPathVTable vlc_dbus_root_vtable = {
         NULL, handle_root, /* handler function */
         NULL, NULL, NULL, NULL
 };
 
-static DBusObjectPathVTable vlc_dbus_player_vtable = {
+static const DBusObjectPathVTable vlc_dbus_player_vtable = {
         NULL, handle_player, /* handler function */
         NULL, NULL, NULL, NULL
 };
 
-static DBusObjectPathVTable vlc_dbus_tracklist_vtable = {
+static const DBusObjectPathVTable vlc_dbus_tracklist_vtable = {
         NULL, handle_tracklist, /* handler function */
         NULL, NULL, NULL, NULL
 };