Changeset 678f97a658be15939b2b72e455f338a9de4a8da1

Timestamp:

03/27/08 01:11:40 (6 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1206576700 +0100

git-parent:

[b3390752baeeabbb131dfe40b9b486a98b83c521]

git-author:

Mirsal Ennaime <mirsal.ennaime@gmail.com> 1206413007 +0100

Message:

Dbus control module: * Add the MprisVersion? Method. * The MPRIS 1.0 implementation is now complete.

Signed-off-by: Rafaël Carré <funman@videolan.org>

Files:

• modules/control/dbus.c (modified) (2 diffs)
• modules/control/dbus.h (modified) (3 diffs)

modules/control/dbus.c

@@ -128 +128 @@
-}
-
+DBUS_METHOD( MprisVersion )
+{ /*implemented version of the mpris spec */
+    REPLY_INIT;
+    OUT_ARGUMENTS;
+    VLC_UNUSED( p_this );
+    dbus_uint16_t i_major = VLC_MPRIS_VERSION_MAJOR;
+    dbus_uint16_t i_minor = VLC_MPRIS_VERSION_MINOR;
+    DBusMessageIter version;
+
+    dbus_message_iter_open_container( &args, DBUS_TYPE_STRUCT, NULL, &version );
+    dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16, &i_major );
+    dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16, &i_minor );
+    dbus_message_iter_close_container( &args, &version );
+    REPLY_SEND;
+}
+
-DBUS_METHOD( PositionGet )
-{ /* returns position in milliseconds */
@@ -606 +622 @@
-
-    METHOD_FUNC( "Identity",                Identity );
+    METHOD_FUNC( "MprisVersion",            MprisVersion );
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;

modules/control/dbus.h

@@ -22 +22 @@
- * 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 */
@@ -77 +81 @@
-#define ADD_INT32( i ) DBUS_ADD( DBUS_TYPE_INT32, i )
-#define ADD_BYTE( b ) DBUS_ADD( DBUS_TYPE_BYTE, b )
+#define ADD_UINT16( i ) DBUS_ADD( DBUS_TYPE_UINT16, i )
-
-/* XML data to answer org.freedesktop.DBus.Introspectable.Introspect requests */
@@ -95 +100 @@
-"      <arg type=\"s\" direction=\"out\" />\n"
-"    </method>\n"
+"    <method name=\"MprisVersion\">\n"
+"      <arg type=\"(qq)\" direction=\"out\" />\n"
+"    </method>\n"
-"  </interface>\n"
-"</node>\n"