# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
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 );
+ 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 );
+ 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 );
}