*****************************************************************************/
#include "libvlc_internal.h"
+
#include <vlc/libvlc.h>
#include <vlc_playlist.h>
#include "../playlist/playlist_internal.h"
-#define PL p_instance->p_libvlc_int->p_playlist
+#define PL (libvlc_priv (p_instance->p_libvlc_int)->p_playlist)
static inline int playlist_was_locked( libvlc_instance_t *p_instance )
{
vlc_mutex_unlock( &p_instance->instance_lock );
}
-void libvlc_playlist_loop( libvlc_instance_t *p_instance, vlc_bool_t loop,
+void libvlc_playlist_loop( libvlc_instance_t *p_instance, int loop,
libvlc_exception_t *p_e)
{
+ VLC_UNUSED(p_e);
+
assert( PL );
var_SetBool( PL, "loop", loop );
}
int i_options, char **ppsz_options,
libvlc_exception_t *p_e )
{
+ VLC_UNUSED(p_e); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
+
int did_lock = 0;
assert( PL );
///\todo Handle additionnal options
if (! playlist_was_locked( p_instance ) )
{
playlist_mark_locked( p_instance, 1 );
- vlc_mutex_lock( &PL->object_lock );
+ vlc_object_lock( PL );
did_lock = 1;
}
{
if( did_lock == 1 )
{
- vlc_mutex_unlock( &PL->object_lock );
+ vlc_object_unlock( PL );
playlist_mark_locked( p_instance, 0 );
}
RAISEVOID( "Unable to find item" );
}
- playlist_Control( PL, PLAYLIST_VIEWPLAY, VLC_TRUE,
+ playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
PL->status.p_node, p_item );
if( did_lock == 1 )
{
- vlc_mutex_unlock( &PL->object_lock );
+ vlc_object_unlock( PL );
playlist_mark_locked( p_instance, 0 );
}
}
void libvlc_playlist_clear( libvlc_instance_t *p_instance,
libvlc_exception_t *p_e )
{
+ VLC_UNUSED(p_e);
+
assert( PL );
playlist_Clear( PL, playlist_was_locked( p_instance ) );
}
}
return playlist_AddExt( PL, psz_uri, psz_name,
PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
- i_options, 1, VLC_FALSE );
+ i_options, 1, pl_Unlocked );
}
int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
libvlc_exception_t *p_e )
{
+ VLC_UNUSED(p_e);
+
assert( PL );
return playlist_IsPlaying( PL );
}
int libvlc_playlist_items_count( libvlc_instance_t *p_instance,
libvlc_exception_t *p_e )
{
+ VLC_UNUSED(p_e);
+
assert( PL );
return playlist_CurrentSize( PL );
}
+int libvlc_playlist_get_current_index ( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
+{
+ VLC_UNUSED(p_e);
+
+ assert( PL );
+ if( !PL->status.p_item )
+ return -1;
+ return playlist_CurrentId( PL );
+}
+
void libvlc_playlist_lock( libvlc_instance_t *p_instance )
{
assert( PL );
- vlc_mutex_lock( &PL->object_lock );
+ vlc_object_lock( PL );
p_instance->b_playlist_locked = 1;
}
{
assert( PL );
p_instance->b_playlist_locked = 0;
- vlc_mutex_unlock( &PL->object_lock );
+ vlc_object_unlock( PL );
}
-libvlc_media_instance_t * libvlc_playlist_get_media_instance(
+libvlc_media_player_t * libvlc_playlist_get_media_player(
libvlc_instance_t *p_instance,
libvlc_exception_t *p_e )
{
- libvlc_media_instance_t *p_mi;
+ libvlc_media_player_t *p_mi;
assert( PL );
- vlc_mutex_lock( &PL->object_lock );
- p_mi = libvlc_media_instance_new_from_input_thread(
- p_instance, PL->p_input, p_e );
- vlc_mutex_unlock( &PL->object_lock );
+ vlc_object_lock( PL );
+ if( PL->p_input )
+ {
+ p_mi = libvlc_media_player_new_from_input_thread(
+ p_instance, PL->p_input, p_e );
+ }
+ else
+ {
+ /* no active input */
+ p_mi = NULL;
+ libvlc_exception_raise( p_e, "No active input" );
+ }
+ vlc_object_unlock( PL );
return p_mi;
}
+