Commit 5c8d5646 authored by Clément Stenac's avatar Clément Stenac

Don't notify playlist from input, input does it already

The previous commit and this one globally have a rather negative impact, as we notify playlist waaayy too much while adding info. Should either be implemented in interface to reduce the number of updates, or as a flag to add_info if we have some more to do afterwards
parent 58114140
...@@ -1058,11 +1058,6 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) ...@@ -1058,11 +1058,6 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
} }
/* Trigger intf update for this item */
/* Playlist has a callback on this variable and will forward
* it to intf */
var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id );
/* initialization is complete */ /* initialization is complete */
p_input->i_state = PLAYING_S; p_input->i_state = PLAYING_S;
......
...@@ -47,9 +47,6 @@ static void RunPreparse( playlist_preparse_t * ); ...@@ -47,9 +47,6 @@ static void RunPreparse( playlist_preparse_t * );
static playlist_item_t * NextItem ( playlist_t * ); static playlist_item_t * NextItem ( playlist_t * );
static int PlayItem ( playlist_t *, playlist_item_t * ); static int PlayItem ( playlist_t *, playlist_item_t * );
static int ItemChange( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args ); int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args );
void playlist_PreparseEnqueueItemSub( playlist_t *, playlist_item_t * ); void playlist_PreparseEnqueueItemSub( playlist_t *, playlist_item_t * );
...@@ -1154,9 +1151,6 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) ...@@ -1154,9 +1151,6 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
p_playlist->p_input = input_CreateThread( p_playlist, &p_item->input ); p_playlist->p_input = input_CreateThread( p_playlist, &p_item->input );
var_AddCallback( p_playlist->p_input, "item-change",
ItemChange, p_playlist );
val.i_int = p_item->input.i_id; val.i_int = p_item->input.i_id;
/* unlock the playlist to set the var...mmm */ /* unlock the playlist to set the var...mmm */
vlc_mutex_unlock( &p_playlist->object_lock); vlc_mutex_unlock( &p_playlist->object_lock);
...@@ -1166,19 +1160,3 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) ...@@ -1166,19 +1160,3 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/* Forward item change from input */
static int ItemChange( vlc_object_t *p_obj, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
playlist_t *p_playlist = (playlist_t *)param;
//p_playlist->b_need_update = VLC_TRUE;
var_SetInteger( p_playlist, "item-change", newval.i_int );
/* Update view */
/* FIXME: Make that automatic */
// playlist_ViewUpdate( p_playlist, VIEW_S_AUTHOR );
return VLC_SUCCESS;
}
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