From 103f9309eefa94b7c3600bd5c4a36bd2b563251b Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 20 Feb 2015 00:12:38 +0200 Subject: [PATCH] notify: use input-current callback and simplify --- modules/notify/notify.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/modules/notify/notify.c b/modules/notify/notify.c index 5ad3247d92..2c4dfc99c5 100644 --- a/modules/notify/notify.c +++ b/modules/notify/notify.c @@ -122,7 +122,7 @@ static int Open( vlc_object_t *p_this ) } /* */ - var_AddCallback( pl_Get( p_intf ), "activity", ItemChange, p_intf ); + var_AddCallback( pl_Get( p_intf ), "input-current", ItemChange, p_intf ); return VLC_SUCCESS; } @@ -135,7 +135,7 @@ static void Close( vlc_object_t *p_this ) intf_thread_t *p_intf = ( intf_thread_t* ) p_this; intf_sys_t *p_sys = p_intf->p_sys; - var_DelCallback( pl_Get( p_intf ), "activity", ItemChange, p_this ); + var_DelCallback( pl_Get( p_intf ), "input-current", ItemChange, p_this ); if( p_sys->notification ) { @@ -162,7 +162,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, char *psz_artist; char *psz_album; char *psz_arturl; - input_thread_t *p_input = playlist_CurrentInput( (playlist_t*)p_this ); + input_thread_t *p_input = newval.p_address; intf_thread_t *p_intf = param; intf_sys_t *p_sys = p_intf->p_sys; @@ -170,15 +170,8 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, return VLC_SUCCESS; if( p_input->b_dead ) - { /* Not playing anything ... */ - vlc_object_release( p_input ); return VLC_SUCCESS; - } - - /* Wait a tad so the meta has been fetched - * FIXME that's awfully wrong */ - msleep( 10000 ); /* Playing something ... */ input_item_t *p_input_item = input_GetItem( p_input ); @@ -188,7 +181,6 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, if( EMPTY_STR( psz_title ) ) { free( psz_title ); - vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -213,7 +205,6 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, GdkPixbuf *pix = NULL; psz_arturl = input_item_GetArtURL( p_input_item ); - vlc_object_release( p_input ); if( psz_arturl ) { -- 2.39.5