[vlc-commits] Revert "Notify: add a callback to match telepathy, msn"

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 13 23:41:42 2012 +0300| [e89f4296febf218a5669a8ceb09ee79d9def0f25] | committer: 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 fc56b92af1636c53a0545109a74476fe74c054a5.
This should fix #6641.
(cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e89f4296febf218a5669a8ceb09ee79d9def0f25
---

 modules/notify/notify.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/notify/notify.c b/modules/notify/notify.c
index 0dc494d..198221c 100644
--- a/modules/notify/notify.c
+++ b/modules/notify/notify.c
@@ -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-change", ItemChange, p_intf );
 
     return VLC_SUCCESS;
 }
@@ -136,7 +135,6 @@ static void Close( vlc_object_t *p_this )
     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-change", ItemChange, p_this );
 
     if( p_sys->notification )
     {