Commit e89f4296 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "Notify: add a callback to match telepathy, msn"

The "item-change" callback is called with the playlist lock held in
at least one case: when the now playing meta is cleared while a new
input is created by the playlist.

playlist_CurrentInput() acquires the playlist lock. So the
"item-change" callback cannot call it. This bug is present in the
Growl, MSN and Telepathy modules since version 1.0.0. It got copied
into Notify in version 2.0.0.

This reverts commit fc56b92a.
This should fix #6641.
(cherry picked from commit 1e5f4b46)
parent b895679e
...@@ -122,7 +122,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -122,7 +122,6 @@ static int Open( vlc_object_t *p_this )
/* */ /* */
var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf ); var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
var_AddCallback( pl_Get( p_intf ), "item-change", ItemChange, p_intf );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -136,7 +135,6 @@ static void Close( vlc_object_t *p_this ) ...@@ -136,7 +135,6 @@ static void Close( vlc_object_t *p_this )
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this ); var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
var_DelCallback( pl_Get( p_this ), "item-change", ItemChange, p_this );
if( p_sys->notification ) if( p_sys->notification )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment