Cherry-pick fix for VLC hang caused by the notify plugin.
Closes: #662628
LP: #970447
Benjamin Drung
11 years ago
| 0 | From: Rémi Denis-Courmont <remi@remlab.net> | |
| 1 | Subject: [PATCH] Revert "Notify: add a callback to match telepathy, msn" | |
| 2 | . | |
| 3 | The "item-change" callback is called with the playlist lock held in | |
| 4 | at least one case: when the now playing meta is cleared while a new | |
| 5 | input is created by the playlist. | |
| 6 | . | |
| 7 | playlist_CurrentInput() acquires the playlist lock. So the | |
| 8 | "item-change" callback cannot call it. This bug is present in the | |
| 9 | Growl, MSN and Telepathy modules since version 1.0.0. It got copied | |
| 10 | into Notify in version 2.0.0. | |
| 11 | . | |
| 12 | This reverts commit fc56b92af1636c53a0545109a74476fe74c054a5. | |
| 13 | This should fix #6641. | |
| 14 | (cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3) | |
| 15 | Origin: http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=e89f4296 | |
| 16 | Applied-Upstream: 2.0.4 | |
| 17 | Bug: http://trac.videolan.org/vlc/ticket/6641 | |
| 18 | Bug-Debian: http://bugs.debian.org/662628 | |
| 19 | Bug-Ubuntu: https://launchpad.net/bugs/970447 | |
| 20 | ||
| 21 | --- a/modules/notify/notify.c | |
| 22 | +++ b/modules/notify/notify.c | |
| 23 | @@ -122,7 +122,6 @@ | |
| 24 | ||
| 25 | /* */ | |
| 26 | var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf ); | |
| 27 | - var_AddCallback( pl_Get( p_intf ), "item-change", ItemChange, p_intf ); | |
| 28 | ||
| 29 | return VLC_SUCCESS; | |
| 30 | } | |
| 31 | @@ -136,7 +135,6 @@ | |
| 32 | intf_sys_t *p_sys = p_intf->p_sys; | |
| 33 | ||
| 34 | var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this ); | |
| 35 | - var_DelCallback( pl_Get( p_this ), "item-change", ItemChange, p_this ); | |
| 36 | ||
| 37 | if( p_sys->notification ) | |
| 38 | { |