Returns object hierarchy with root object introspection data. Thanks to eean.

Uses correct interface name.

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index e8ad66812b49b25a14bd06bb3977799d9d0effb4..d6ed766f48cd8cd5f602c3744914c742576834bd 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -615,7 +615,7 @@ DBUS_METHOD( Random )
  *****************************************************************************/
 
 DBUS_METHOD( handle_introspect_root )
-{ /* handles introspection of /org/videolan/vlc */
+{ /* handles introspection of root object */
     REPLY_INIT;
     OUT_ARGUMENTS;
     ADD_STRING( &psz_introspection_xml_data_root );

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index 9b4508a86753b4f5fa4025c7186d1e2a6f72252b..01e28b68f5783f28e4c3c4b02872382dcb77ec2f 100644 (file)
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -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"
@@ -160,7 +162,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"