Changeset 42c421605a7d2f7ccfaeb2a8b25d6565fc98279f

Timestamp:

10/23/07 01:47:24 (11 months ago)

Author:

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

git-committer:

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

git-parent:

[95466d5ef9b48a2ea50d9aa246dee2023f3d12ff]

git-author:

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

Message:

dbus: updates to match the current status of MPRIS. Patch by Mirsal Ennaime as usual

Files:

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

modules/control/dbus.c

@@ -2 +2 @@
- * dbus.c : D-Bus control interface
- *****************************************************************************
-
+
+
- * $Id$
- *
@@ -29 +30 @@
- *      http://dbus.freedesktop.org/doc/dbus/api/html/index.html
- *  extract:
-
-
-
+
+
+
+
- */
-
@@ -63 +65 @@
-                        vlc_value_t, void * );
-
+static int StatusChangeEmit( vlc_object_t *, const char *, vlc_value_t,
+                        vlc_value_t, void * );
+
-static int GetInputMeta ( input_item_t *, DBusMessageIter * );
+static int MarshalStatus ( intf_thread_t *, DBusMessageIter * );
-
-struct intf_sys_t
@@ -69 +75 @@
-    DBusConnection *p_conn;
-    vlc_bool_t      b_meta_read;
-    input_thread_t *p_input;
-};
-
@@ -230 +235 @@
-
-DBUS_METHOD( GetStatus )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    REPLY_SEND;
-}
@@ -634 +626 @@
-
-    p_sys->b_meta_read = VLC_FALSE;
-    p_sys->p_input = NULL;
-
-    dbus_error_init( &error );
@@ -673 +664 @@
-    PL_LOCK;
-    var_AddCallback( p_playlist, "playlist-current", TrackChange, p_intf );
+    var_AddCallback( p_playlist, "random", StatusChangeEmit, p_intf );
+    var_AddCallback( p_playlist, "repeat", StatusChangeEmit, p_intf );
+    var_AddCallback( p_playlist, "loop", StatusChangeEmit, p_intf );
-    PL_UNLOCK;
-    pl_Release( p_playlist );
@@ -691 +685 @@
-    intf_thread_t   *p_intf     = (intf_thread_t*) p_this;
-    playlist_t      *p_playlist = pl_Yield( p_intf );;
+    input_thread_t  *p_input;
+
+    p_this->b_dead = VLC_TRUE;
-
-    PL_LOCK;
-    var_DelCallback( p_playlist, "playlist-current", TrackChange, p_intf );
+    var_DelCallback( p_playlist, "random", StatusChangeEmit, p_intf );
+    var_DelCallback( p_playlist, "repeat", StatusChangeEmit, p_intf );
+    var_DelCallback( p_playlist, "loop", StatusChangeEmit, p_intf );
+
+    p_input = p_playlist->p_input;
+    if ( p_input )
+    {
+        vlc_object_yield( p_input );
+        var_DelCallback( p_input, "state", StateChange, p_intf );
+        vlc_object_release( p_input );
+    }
+
-    PL_UNLOCK;
-    if( p_intf->p_sys->p_input )
-        var_DelCallback( p_intf->p_sys->p_input, "state", StateChange, p_intf );
-    pl_Release( p_playlist );
-
@@ -733 +740 @@
-
-/*****************************************************************************
+ * StatusChange: Player status change signal
+ *****************************************************************************/
+
+DBUS_SIGNAL( StatusChangeSignal )
+{ /* send the updated status info on the bus */
+    SIGNAL_INIT( "StatusChange" );
+    OUT_ARGUMENTS;
+
+    MarshalStatus( (intf_thread_t*) p_data, &args );
+
+    SIGNAL_SEND;
+}
+
+/*****************************************************************************
- * StateChange: callback on input "state"
- *****************************************************************************/
@@ -740 +761 @@
-    intf_thread_t       *p_intf     = ( intf_thread_t* ) p_data;
-    intf_sys_t          *p_sys      = p_intf->p_sys;
+
+    if( p_this->b_dead )
+        return VLC_SUCCESS;
-
-    if( !p_sys->b_meta_read && newval.i_int == PLAYING_S )
@@ -751 +775 @@
-    }
-
+    if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S ||
+        newval.i_int == END_S )
+    {
+        StatusChangeSignal( p_sys->p_conn, (void*) p_intf );
+    }
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * StatusChangeEmit: Emits the StatusChange signal
+ *****************************************************************************/
+static int StatusChangeEmit( vlc_object_t *p_this, const char *psz_var,
+            vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    if( p_this->b_dead )
+        return VLC_SUCCESS;
+
+    StatusChangeSignal( ((intf_thread_t*)p_data)->p_sys->p_conn, p_data );
-    return VLC_SUCCESS;
-}
@@ -768 +811 @@
-    VLC_UNUSED( oldval ); VLC_UNUSED( newval );
-
+    if( p_this->b_dead )
+        return VLC_SUCCESS;
+
-    p_sys->b_meta_read = VLC_FALSE;
-
@@ -792 +838 @@
-    }
-
-    p_sys->p_input = NULL;
-    if( input_item_IsPreparsed( p_item ) )
-    {
@@ -798 +843 @@
-        TrackChangeSignal( p_sys->p_conn, p_item );
-    }
-
-
-
-
-
+
+
-
-    vlc_object_release( p_input );
@@ -836 +878 @@
-static int GetInputMeta( input_item_t* p_input,
-                        DBusMessageIter *args )
-
-
+
-    DBusMessageIter dict, dict_entry, variant;
-    /* We need the track length to be expressed in seconds
@@ -886 +927 @@
-#undef ADD_META
-#undef ADD_VLC_META_STRING
+
+/*****************************************************************************
+ * MarshalStatus: Fill a DBusMessage with the current player status
+ *****************************************************************************/
+
+static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args )
+{ /* This is NOT the right way to do that, it would be better to sore
+     the status information in p_sys and update it on change, thus
+     avoiding a long lock */
+
+    DBusMessageIter status;
+    dbus_int32_t i_state, i_random, i_repeat, i_loop;
+    vlc_value_t val;
+    playlist_t* p_playlist = NULL;
+    input_thread_t* p_input = NULL;
+
+    p_playlist = pl_Yield( (vlc_object_t*) p_intf );
+    PL_LOCK;
+    p_input = p_playlist->p_input;
+
+    i_state = 2;
+    if( p_input )
+    {
+        var_Get( p_input, "state", &val );
+        if( val.i_int >= END_S )
+            i_state = 2;
+        else if( val.i_int == PAUSE_S )
+            i_state = 1;
+        else if( val.i_int <= PLAYING_S )
+            i_state = 0;
+    }
+
+    var_Get( p_playlist, "random", &val );
+    i_random = val.i_int;
+
+    var_Get( p_playlist, "repeat", &val );
+    i_repeat = val.i_int;
+
+    var_Get( p_playlist, "loop", &val );
+    i_loop = val.i_int;
+
+    PL_UNLOCK;
+    pl_Release( p_playlist );
+
+    dbus_message_iter_open_container( args, DBUS_TYPE_STRUCT, NULL, &status );
+    dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_state );
+    dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_random );
+    dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_repeat );
+    dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_loop );
+    dbus_message_iter_close_container( args, &status );
+
+    return VLC_SUCCESS;
+
+}

modules/control/dbus.h

@@ -111 +111 @@
-"  <interface name=\"org.freedesktop.MediaPlayer\">\n"
-"    <method name=\"GetStatus\">\n"
-i
+(iiii)
-"    </method>\n"
-"    <method name=\"Quit\">\n"
@@ -147 +147 @@
-"    </signal>\n"
-"    <signal name=\"StatusChange\">\n"
-i
+(iiii)
-"    </signal>\n"
-"    <signal name=\"CapsChange\">\n"