X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.h;h=4b681b2756102d61661a84f6561a487f8392cfb9;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=cd263357ca03c70b264b9be9030d8db5f8e4a969;hpb=88b35bff5b7ddfd26ff0cac700a4466758c375b6;p=vlc

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index cd263357ca..4b681b2756 100644
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -25,18 +25,18 @@
 /* DBUS IDENTIFIERS */
 
 /* name registered on the session bus */
-#define VLC_DBUS_SERVICE        "org.freedesktop.MediaPlayer"
-#define VLC_DBUS_INTERFACE      "org.freedesktop.MediaPlayer"
-#define VLC_DBUS_ROOT_PATH      "/"
-#define VLC_DBUS_PLAYER_PATH    "/Player"
-#define VLC_DBUS_TRACKLIST_PATH "/TrackList"
+#define VLC_MPRIS_DBUS_SERVICE      "org.mpris.vlc"
+#define MPRIS_DBUS_INTERFACE        "org.freedesktop.MediaPlayer"
+#define MPRIS_DBUS_ROOT_PATH        "/"
+#define MPRIS_DBUS_PLAYER_PATH      "/Player"
+#define MPRIS_DBUS_TRACKLIST_PATH   "/TrackList"
 
 /* MACROS */
 
 /* DBus related */
 #define DBUS_METHOD( method_function ) \
     static DBusHandlerResult method_function \
-            ( DBusConnection *p_conn, DBusMessage *p_from, void *p_this ) 
+            ( DBusConnection *p_conn, DBusMessage *p_from, void *p_this )
 
 #define DBUS_SIGNAL( signal_function ) \
     static DBusHandlerResult signal_function \
@@ -54,8 +54,8 @@
     return DBUS_HANDLER_RESULT_HANDLED
 
 #define SIGNAL_INIT( signal ) \
-    DBusMessage *p_msg = dbus_message_new_signal( VLC_DBUS_PLAYER_PATH, \
-        VLC_DBUS_INTERFACE, signal ); \
+    DBusMessage *p_msg = dbus_message_new_signal( MPRIS_DBUS_PLAYER_PATH, \
+        MPRIS_DBUS_INTERFACE, signal ); \
     if( !p_msg ) return DBUS_HANDLER_RESULT_NEED_MEMORY; \
 
 #define SIGNAL_SEND \
@@ -88,7 +88,9 @@
 const char* psz_introspection_xml_data_root =
 "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
 "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
-"<node>"
+"<node>\n"
+"  <node name=\"Player\"/>\n"
+"  <node name=\"TrackList\"/>\n"
 "  <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
 "    <method name=\"Introspect\">\n"
 "      <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
@@ -111,7 +113,7 @@ const char* psz_introspection_xml_data_player =
 "      <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
 "    </method>\n"
 "  </interface>\n"
-"  <interface name=\"org.videolan.vlc\">\n"
+"  <interface name=\"org.freedesktop.MediaPlayer\">\n"
 "    <method name=\"GetStatus\">\n"
 "      <arg type=\"i\" direction=\"out\" />\n"
 "    </method>\n"
@@ -145,6 +147,17 @@ const char* psz_introspection_xml_data_player =
 "    <method name=\"GetMetadata\">\n"
 "      <arg type=\"a{sv}\" direction=\"out\" />\n"
 "    </method>\n"
+"    <method name=\"Disconnect\">\n"
+"    </method>\n"
+"    <signal name=\"TrackChange\">\n"
+"      <arg type=\"a{sv}\"/>\n"
+"    </signal>\n"
+"    <signal name=\"StatusChange\">\n"
+"      <arg type=\"i\"/>\n"
+"    </signal>\n"
+"    <signal name=\"CapsChange\">\n"
+"      <arg type=\"i\"/>\n"
+"    </signal>\n"
 "  </interface>\n"
 "</node>\n"
 ;
@@ -158,7 +171,7 @@ const char* psz_introspection_xml_data_tracklist =
 "      <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
 "    </method>\n"
 "  </interface>\n"
-"  <interface name=\"org.videolan.vlc\">\n"
+"  <interface name=\"org.freedesktop.MediaPlayer\">\n"
 "    <method name=\"AddTrack\">\n"
 "      <arg type=\"s\" direction=\"in\" />\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
@@ -186,9 +199,9 @@ const char* psz_introspection_xml_data_tracklist =
 "</node>\n"
 ;
 
-#define VLC_DBUS_ROOT_PATH      "/"
-#define VLC_DBUS_PLAYER_PATH    "/Player"
-#define VLC_DBUS_TRACKLIST_PATH "/TrackList"
+#define MPRIS_DBUS_ROOT_PATH      "/"
+#define MPRIS_DBUS_PLAYER_PATH    "/Player"
+#define MPRIS_DBUS_TRACKLIST_PATH "/TrackList"
 
 /* Handle  messages reception */
 DBUS_METHOD( handle_root );