# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
/*****************************************************************************
* Useful function to retrieve p_intf
****************************************************************************/
-void * E_(__GtkGetIntf)( GtkWidget * widget )
+void * __GtkGetIntf( GtkWidget * widget )
{
void *p_data;
gtk_list_store_set (GTK_LIST_STORE(p_play_model), &p_play_iter,
0, name, /* Add path to it !!! */
1, "no info",
- 2, playlist_CurrentSize(p_intf), /* Hidden index. */
+ 2, playlist_CurrentSize(p_playlist), /* Hidden index. */
-1 );
/* Add to VLC's playlist */
PLAYLIST_APPEND, PLAYLIST_END,
(mtime_t) 0,
(const char **) ppsz_options, i_pos,
- true, false );
+ true, pl_Unlocked );
}
/* Cleanup memory */
red.blue = 0;
red.green = 0;
#endif
- vlc_mutex_lock( &p_playlist->object_lock );
- for( i_dummy = 0; i_dummy < playlist_CurrentSize(p_intf) ; i_dummy++ )
+ vlc_object_lock( p_playlist );
+ for( i_dummy = 0; i_dummy < playlist_CurrentSize(p_playlist) ; i_dummy++ )
{
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy, true );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy, pl_Locked );
if( p_item )
{
ppsz_text[0] = p_item->p_input->psz_name;
-1);
}
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_unlock( p_playlist );
}
/*****************************************************************
if (p_playlist)
{
- vlc_mutex_lock( &p_playlist->object_lock );
- if (playlist_CurrentSize(p_intf))
+ vlc_object_lock( p_playlist );
+ if (playlist_CurrentSize(p_playlist))
{
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_unlock( p_playlist );
playlist_Play( p_playlist );
gdk_window_lower( p_intf->p_sys->p_window->window );
}
else
{
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_unlock( p_playlist );
}
vlc_object_release( p_playlist );
}
return;
}
- for(item = playlist_CurrentSize(p_intf) - 1; item >= 0 ;item-- )
+ for(item = playlist_CurrentSize(p_playlist) - 1; item >= 0 ;item-- )
{
msg_Err( p_playlist, "fix pda delete" );
}