vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Feb 20 00:13:13 2015 +0200| [1fa7df90a6ffb585ed7ba8d74d0dc3f1ce654d06] | committer: Rémi Denis-Courmont
growl: use input-current callback and simplify > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1fa7df90a6ffb585ed7ba8d74d0dc3f1ce654d06 --- modules/notify/growl.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/notify/growl.m b/modules/notify/growl.m index 4c5c281..e901e3d 100644 --- a/modules/notify/growl.m +++ b/modules/notify/growl.m @@ -126,7 +126,7 @@ static int Open( vlc_object_t *p_this ) p_playlist = pl_Get( p_intf ); var_AddCallback( p_playlist, "item-change", ItemChange, p_intf ); - var_AddCallback( p_playlist, "activity", ItemChange, p_intf ); + var_AddCallback( p_playlist, "input-current", ItemChange, p_intf ); [p_sys->o_growl_delegate registerToGrowl]; return VLC_SUCCESS; @@ -142,7 +142,7 @@ static void Close( vlc_object_t *p_this ) intf_sys_t *p_sys = p_intf->p_sys; var_DelCallback( p_playlist, "item-change", ItemChange, p_intf ); - var_DelCallback( p_playlist, "activity", ItemChange, p_intf ); + var_DelCallback( p_playlist, "input-current", ItemChange, p_intf ); [p_sys->o_growl_delegate release]; free( p_sys ); @@ -163,12 +163,12 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, char *psz_album = NULL; input_item_t *p_item = newval.p_address; - bool b_is_item_current = !strcmp( "activity", psz_var ); + bool b_is_item_current = !strcmp( "input-current", psz_var ); /* Don't update each time an item has been preparsed */ if( b_is_item_current ) { /* stores the current input item id */ - input_thread_t *p_input = playlist_CurrentInput( (playlist_t*)p_this ); + input_thread_t *p_input = newval.p_address; if( !p_input ) return VLC_SUCCESS; @@ -179,7 +179,6 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, p_intf->p_sys->i_item_changes = 0; } - vlc_object_release( p_input ); return VLC_SUCCESS; } /* ignore items which weren't pre-parsed yet */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
