X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.h;h=b1093bd5dc19ee121a8949255a820114209f093c;hb=5f8cd3991a86c8be37fe0bce9686c2d6f7635afa;hp=4b681b2756102d61661a84f6561a487f8392cfb9;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc
diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index 4b681b2756..b1093bd5dc 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 )
@@ -78,11 +81,6 @@
#define ADD_INT32( i ) DBUS_ADD( DBUS_TYPE_INT32, i )
#define ADD_BYTE( b ) DBUS_ADD( DBUS_TYPE_BYTE, b )
-/* VLC related */
-#define TEST_NEXT \
- p_tested_item = playlist_GetNextLeaf( p_playlist, \
- p_playlist->p_root_onelevel, p_tested_item, VLC_FALSE, VLC_FALSE );
-
/* XML data to answer org.freedesktop.DBus.Introspectable.Introspect requests */
const char* psz_introspection_xml_data_root =
@@ -100,6 +98,11 @@ const char* psz_introspection_xml_data_root =
" \n"
" \n"
" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
" \n"
"\n"
;
@@ -115,9 +118,7 @@ const char* psz_introspection_xml_data_player =
" \n"
" \n"
" \n"
-" \n"
-" \n"
-" \n"
+" \n"
" \n"
" \n"
" \n"
@@ -147,13 +148,14 @@ const char* psz_introspection_xml_data_player =
" \n"
" \n"
" \n"
-" \n"
+" \n"
+" \n"
" \n"
" \n"
" \n"
" \n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
" \n"
@@ -175,6 +177,7 @@ const char* psz_introspection_xml_data_tracklist =
" \n"
" \n"
" \n"
+" \n"
" \n"
" \n"
" \n"
@@ -189,12 +192,15 @@ const char* psz_introspection_xml_data_tracklist =
" \n"
" \n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
+" \n"
+" \n"
+" \n"
" \n"
"\n"
;
@@ -208,17 +214,17 @@ 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
};