Changeset f32bdde1ba38fb390b8288d67e81514bb25f71dc

Timestamp:

10/12/07 15:17:34 (10 months ago)

Author:

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

git-committer:

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

git-parent:

[848c1c1f12aaab8c20755462b7f37c226c04473a]

git-author:

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

Message:

telepathy: shows an empty status when VLC has been stopped

Files:

• modules/misc/notify/telepathy.c (modified) (6 diffs)

modules/misc/notify/telepathy.c

@@ -52 +52 @@
-static int ItemChange( vlc_object_t *, const char *,
-                       vlc_value_t, vlc_value_t, void * );
+static int StateChange( vlc_object_t *, const char *,
+                        vlc_value_t, vlc_value_t, void * );
-static int SendToTelepathy( intf_thread_t *, const char * );
-
@@ -129 +131 @@
-static void Close( vlc_object_t *p_this )
-{
+    p_this->b_dead = VLC_TRUE;
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
-    playlist_t *p_playlist = pl_Yield( p_this );
@@ -138 +141 @@
-    SendToTelepathy( p_intf, "" );
-
+    PL_LOCK;
-    var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    if( p_playlist->p_input )
+        var_DelCallback( p_playlist->p_input, "state", StateChange, p_intf );
+    PL_UNLOCK;
-    pl_Release( p_this );
-
@@ -159 +166 @@
-    char *psz_buf = NULL;
-    input_thread_t *p_input;
+
+    if( p_intf->b_dead )
+        return VLC_EGENERIC;
-
-    /* Don't update Telepathy presence each time an item has been preparsed */
@@ -200 +210 @@
-    }
-
+    if( !strncmp( "playlist-current", psz_var, 16 ) )
+        var_AddCallback( p_input, "state", StateChange, p_intf );
+
-    /* We format the string to be displayed */
-    psz_buf = str_format_meta( p_this, p_intf->p_sys->psz_format );
+
-    /* We don't need the input anymore */
-    vlc_object_release( p_input );
@@ -211 +225 @@
-    }
-    free( psz_buf );
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * StateChange: State change callback
+ *****************************************************************************/
+static int StateChange( vlc_object_t *p_this, const char *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *param )
+{
+    intf_thread_t *p_intf = (intf_thread_t *)param;
+    if( p_intf->b_dead )
+        return VLC_EGENERIC;
+    if( newval.i_int >= END_S )
+        return SendToTelepathy( p_intf, "" );
-    return VLC_SUCCESS;
-}