libvlccore: Don't set the priority on first thread on Mac OS X.

[vlc] / modules / control / dbus.h

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index aab69e54d2eec2767a516f23b9edc4930e145dc6..40dfde1037f465e62c30887eff8239f948df7df9 100644 (file)
--- 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,12 +81,6 @@
 #define ADD_INT32( i ) DBUS_ADD( DBUS_TYPE_INT32, i )
 #define ADD_BYTE( b ) DBUS_ADD( DBUS_TYPE_BYTE, b )
 
-/* VLC related */
-/* Don't forget to test p_tested_item for NULL on loops */
-#define TEST_NEXT_ITEM \
-    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 =
@@ -101,6 +98,11 @@ const char* psz_introspection_xml_data_root =
 "    <method name=\"Identity\">\n"
 "      <arg type=\"s\" direction=\"out\" />\n"
 "    </method>\n"
+"    <method name=\"MprisVersion\">\n"
+"      <arg type=\"(qq)\" direction=\"out\" />\n"
+"    </method>\n"
+"    <method name=\"Quit\">\n"
+"    </method>\n"
 "  </interface>\n"
 "</node>\n"
 ;
@@ -116,9 +118,7 @@ const char* psz_introspection_xml_data_player =
 "  </interface>\n"
 "  <interface name=\"org.freedesktop.MediaPlayer\">\n"
 "    <method name=\"GetStatus\">\n"
-"      <arg type=\"i\" direction=\"out\" />\n"
-"    </method>\n"
-"    <method name=\"Quit\">\n"
+"      <arg type=\"(iiii)\" direction=\"out\" />\n"
 "    </method>\n"
 "    <method name=\"Prev\">\n"
 "    </method>\n"
@@ -148,11 +148,14 @@ const char* psz_introspection_xml_data_player =
 "    <method name=\"GetMetadata\">\n"
 "      <arg type=\"a{sv}\" direction=\"out\" />\n"
 "    </method>\n"
+"    <method name=\"GetCaps\">\n"
+"      <arg type=\"i\" direction=\"out\" />\n"
+"    </method>\n"
 "    <signal name=\"TrackChange\">\n"
 "      <arg type=\"a{sv}\"/>\n"
 "    </signal>\n"
 "    <signal name=\"StatusChange\">\n"
-"      <arg type=\"i\"/>\n"
+"      <arg type=\"(iiii)\"/>\n"
 "    </signal>\n"
 "    <signal name=\"CapsChange\">\n"
 "      <arg type=\"i\"/>\n"
@@ -174,6 +177,7 @@ const char* psz_introspection_xml_data_tracklist =
 "    <method name=\"AddTrack\">\n"
 "      <arg type=\"s\" direction=\"in\" />\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
+"      <arg type=\"i\" direction=\"out\" />\n"
 "    </method>\n"
 "    <method name=\"DelTrack\">\n"
 "      <arg type=\"i\" direction=\"in\" />\n"
@@ -188,12 +192,15 @@ const char* psz_introspection_xml_data_tracklist =
 "    <method name=\"GetLength\">\n"
 "      <arg type=\"i\" direction=\"out\" />\n"
 "    </method>\n"
-"    <method name=\"Loop\">\n"
+"    <method name=\"SetLoop\">\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
 "    </method>\n"
-"    <method name=\"Random\">\n"
+"    <method name=\"SetRandom\">\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
 "    </method>\n"
+"    <signal name=\"TrackListChange\">\n"
+"      <arg type=\"i\" />\n"
+"    </signal>\n"
 "  </interface>\n"
 "</node>\n"
 ;