Commit e9075349 authored by Rafaël Carré's avatar Rafaël Carré

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

Uses correct interface name.
parent 4a0090f4
...@@ -615,7 +615,7 @@ DBUS_METHOD( Random ) ...@@ -615,7 +615,7 @@ DBUS_METHOD( Random )
*****************************************************************************/ *****************************************************************************/
DBUS_METHOD( handle_introspect_root ) DBUS_METHOD( handle_introspect_root )
{ /* handles introspection of /org/videolan/vlc */ { /* handles introspection of root object */
REPLY_INIT; REPLY_INIT;
OUT_ARGUMENTS; OUT_ARGUMENTS;
ADD_STRING( &psz_introspection_xml_data_root ); ADD_STRING( &psz_introspection_xml_data_root );
......
...@@ -88,7 +88,9 @@ ...@@ -88,7 +88,9 @@
const char* psz_introspection_xml_data_root = const char* psz_introspection_xml_data_root =
"<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n" "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\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" " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
" <method name=\"Introspect\">\n" " <method name=\"Introspect\">\n"
" <arg name=\"data\" direction=\"out\" type=\"s\"/>\n" " <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
...@@ -111,7 +113,7 @@ const char* psz_introspection_xml_data_player = ...@@ -111,7 +113,7 @@ const char* psz_introspection_xml_data_player =
" <arg name=\"data\" direction=\"out\" type=\"s\"/>\n" " <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
" </method>\n" " </method>\n"
" </interface>\n" " </interface>\n"
" <interface name=\"org.videolan.vlc\">\n" " <interface name=\"org.freedesktop.MediaPlayer\">\n"
" <method name=\"GetStatus\">\n" " <method name=\"GetStatus\">\n"
" <arg type=\"i\" direction=\"out\" />\n" " <arg type=\"i\" direction=\"out\" />\n"
" </method>\n" " </method>\n"
...@@ -160,7 +162,7 @@ const char* psz_introspection_xml_data_tracklist = ...@@ -160,7 +162,7 @@ const char* psz_introspection_xml_data_tracklist =
" <arg name=\"data\" direction=\"out\" type=\"s\"/>\n" " <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
" </method>\n" " </method>\n"
" </interface>\n" " </interface>\n"
" <interface name=\"org.videolan.vlc\">\n" " <interface name=\"org.freedesktop.MediaPlayer\">\n"
" <method name=\"AddTrack\">\n" " <method name=\"AddTrack\">\n"
" <arg type=\"s\" direction=\"in\" />\n" " <arg type=\"s\" direction=\"in\" />\n"
" <arg type=\"b\" direction=\"in\" />\n" " <arg type=\"b\" direction=\"in\" />\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment