I hope they will reduce the risk of error until the playlist API is rewritten.
* * - "item-current": It will contains a input_item_t->i_id of the current
* item being played.
*
- * - "item-append": It will contains a pointer to a playlist_add_t.
- * - "item-deleted": It will contains the playlist_item_t->i_id of a deleted
+ * - "playlist-item-append": It will contains a pointer to a playlist_add_t.
+ * - "playlist-item-deleted": It will contains the playlist_item_t->i_id of a deleted
* playlist_item_t.
*
* XXX Be really carefull, playlist_item_t->i_id and input_item_t->i_id are not
PL_LOCK;
var_AddCallback( p_playlist, "item-current", TrackChange, p_intf );
var_AddCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf );
- var_AddCallback( p_playlist, "item-append", TrackListChangeEmit, p_intf );
- var_AddCallback( p_playlist, "item-deleted", TrackListChangeEmit, p_intf );
+ var_AddCallback( p_playlist, "playlist-item-append", TrackListChangeEmit, p_intf );
+ var_AddCallback( p_playlist, "playlist-item-deleted", TrackListChangeEmit, p_intf );
var_AddCallback( p_playlist, "random", StatusChangeEmit, p_intf );
var_AddCallback( p_playlist, "repeat", StatusChangeEmit, p_intf );
var_AddCallback( p_playlist, "loop", StatusChangeEmit, p_intf );
var_DelCallback( p_playlist, "item-current", TrackChange, p_intf );
var_DelCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf );
- var_DelCallback( p_playlist, "item-append", TrackListChangeEmit, p_intf );
- var_DelCallback( p_playlist, "item-deleted", TrackListChangeEmit, p_intf );
+ var_DelCallback( p_playlist, "playlist-item-append", TrackListChangeEmit, p_intf );
+ var_DelCallback( p_playlist, "playlist-item-deleted", TrackListChangeEmit, p_intf );
var_DelCallback( p_playlist, "random", StatusChangeEmit, p_intf );
var_DelCallback( p_playlist, "repeat", StatusChangeEmit, p_intf );
var_DelCallback( p_playlist, "loop", StatusChangeEmit, p_intf );
VLC_UNUSED(oldval);
intf_thread_t *p_intf = p_data;
- if( !strcmp( psz_var, "item-append" ) )
+ if( !strcmp( psz_var, "playlist-item-append" ) )
{
/* don't signal when items are added/removed in p_category */
playlist_t *p_playlist = (playlist_t*)p_this;
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, this );
- var_AddCallback( p_playlist, "item-append", PlaylistChanged, this );
- var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, this );
+ var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, this );
+ var_AddCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, this );
var_AddCallback( p_playlist, "item-current", PlaylistChanged, this );
char psz_tmp[1024];
var_AddCallback( p_playlist, "item-current", PlaylistChanged, self );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, self );
pl_Release( p_intf );
var_AddCallback( p_playlist, "item-current", PlaylistChanged, self );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, self );
struct manage_cleanup_stack stack = { p_intf, &p_input, p_playlist, self };
pthread_cleanup_push(manage_cleanup, &stack);
*/
PlaylistRebuild( p_intf );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
- var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+ var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, p_intf );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
while( vlc_object_alive( p_intf ) )
}
}
var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
- var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+ var_DelCallback( p_playlist, "playlist-item-append", PlaylistChanged, p_intf );
var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
vlc_restorecancel( canc );
}
var_AddCallback( p_playlist, "item-current", PlaylistNext, this );
/* One item has been updated */
var_AddCallback( p_playlist, "item-change", ItemChanged, this );
- var_AddCallback( p_playlist, "item-append", ItemAppended, this );
- var_AddCallback( p_playlist, "item-deleted", ItemDeleted, this );
+ var_AddCallback( p_playlist, "playlist-item-append", ItemAppended, this );
+ var_AddCallback( p_playlist, "playlist-item-deleted", ItemDeleted, this );
}
void PLModel::delCallbacks()
var_DelCallback( p_playlist, "item-change", ItemChanged, this );
var_DelCallback( p_playlist, "item-current", PlaylistNext, this );
var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
- var_DelCallback( p_playlist, "item-append", ItemAppended, this );
- var_DelCallback( p_playlist, "item-deleted", ItemDeleted, this );
+ var_DelCallback( p_playlist, "playlist-item-append", ItemAppended, this );
+ var_DelCallback( p_playlist, "playlist-item-deleted", ItemDeleted, this );
}
void PLModel::activateItem( const QModelIndex &index )
var_AddCallback( pIntf->p_sys->p_playlist, "intf-change",
onIntfChange, this );
// Called when a playlist item is added
- var_AddCallback( pIntf->p_sys->p_playlist, "item-append",
+ var_AddCallback( pIntf->p_sys->p_playlist, "playlist-item-append",
onItemAppend, this );
// Called when a playlist item is deleted
// TODO: properly handle item-deleted
- var_AddCallback( pIntf->p_sys->p_playlist, "item-deleted",
+ var_AddCallback( pIntf->p_sys->p_playlist, "playlist-item-deleted",
onItemDelete, this );
// Called when the "interface shower" wants us to show the skin
var_AddCallback( pIntf->p_libvlc, "intf-show",
var_DelCallback( getIntf()->p_sys->p_playlist, "intf-change",
onIntfChange, this );
- var_DelCallback( getIntf()->p_sys->p_playlist, "item-append",
+ var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-item-append",
onItemAppend, this );
- var_DelCallback( getIntf()->p_sys->p_playlist, "item-deleted",
+ var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-item-deleted",
onItemDelete, this );
var_DelCallback( getIntf()->p_libvlc, "intf-show",
onIntfShow, this );
var_Create( p_playlist, "item-change", VLC_VAR_INTEGER );
var_SetInteger( p_playlist, "item-change", -1 );
- var_Create( p_playlist, "item-deleted", VLC_VAR_INTEGER );
- var_SetInteger( p_playlist, "item-deleted", -1 );
+ var_Create( p_playlist, "playlist-item-deleted", VLC_VAR_INTEGER );
+ var_SetInteger( p_playlist, "playlist-item-deleted", -1 );
- var_Create( p_playlist, "item-append", VLC_VAR_ADDRESS );
+ var_Create( p_playlist, "playlist-item-append", VLC_VAR_ADDRESS );
var_Create( p_playlist, "item-current", VLC_VAR_INTEGER );
var_SetInteger( p_playlist, "item-current", -1 );
if( b_signal )
vlc_cond_signal( &pl_priv(p_playlist)->signal );
- var_Set( p_playlist, "item-append", val );
+ var_Set( p_playlist, "playlist-item-append", val );
free( p_add );
}
return playlist_NodeDelete( p_playlist, p_item, true, false );
}
pl_priv(p_playlist)->b_reset_currently_playing = true;
- var_SetInteger( p_playlist, "item-deleted", i_id );
+ var_SetInteger( p_playlist, "playlist-item-deleted", i_id );
/* Remove the item from the bank */
ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
else
{
int i;
- var_SetInteger( p_playlist, "item-deleted", p_root->i_id );
+ var_SetInteger( p_playlist, "playlist-item-deleted", p_root->i_id );
ARRAY_BSEARCH( p_playlist->all_items, ->i_id, int,
p_root->i_id, i );
if( i != -1 )