/* DBUS IDENTIFIERS */
/* name registered on the session bus */
-#define VLC_DBUS_SERVICE "org.mpris.vlc"
-#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 \
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 \
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"
" <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"
" </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"
;
" <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"
"</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 );