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

growl: use input-current callback and simplify

parent 103f9309
......@@ -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 */
......
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