* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <libvlc_internal.h>
+#include "libvlc_internal.h"
+
#include <vlc/libvlc.h>
+#include <vlc_playlist.h>
+
+#include <assert.h>
+
+#include "../playlist/playlist_internal.h"
-#include <vlc/intf.h>
+#define PL (libvlc_priv (p_instance->p_libvlc_int)->p_playlist)
+
+static inline int playlist_was_locked( libvlc_instance_t *p_instance )
+{
+ int was_locked;
+ vlc_mutex_lock( &p_instance->instance_lock );
+ was_locked = p_instance->b_playlist_locked;
+ vlc_mutex_unlock( &p_instance->instance_lock );
+ return was_locked;
+}
+
+static inline void playlist_mark_locked( libvlc_instance_t *p_instance,
+ int locked )
+{
+ vlc_mutex_lock( &p_instance->instance_lock );
+ p_instance->b_playlist_locked = locked;
+ vlc_mutex_unlock( &p_instance->instance_lock );
+}
+
+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 );
+}
void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
int i_options, char **ppsz_options,
- libvlc_exception_t *p_exception )
+ 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( p_instance->p_playlist->i_size == 0 )
- {
- libvlc_exception_raise( p_exception, "Empty playlist" );
- return;
- }
- if( i_id >= 0 )
+ if( PL->items.i_size == 0 ) RAISEVOID( "Empty playlist" );
+ if( i_id > 0 )
{
- /* Always use the current view when using libvlc */
- playlist_view_t *p_view;
playlist_item_t *p_item;
-
- if( p_instance->p_playlist->status.i_view == -1 )
+ if (! playlist_was_locked( p_instance ) )
{
- playlist_Control( p_instance->p_playlist, PLAYLIST_GOTO,
- i_id );
- }
- p_view = playlist_ViewFind( p_instance->p_playlist,
- p_instance->p_playlist->status.i_view );
- if( !p_view )
- {
- libvlc_exception_raise( p_exception,
- "Unable to find current playlist view ");
- return;
+ playlist_mark_locked( p_instance, 1 );
+ vlc_object_lock( PL );
+ did_lock = 1;
}
- p_item = playlist_ItemGetById( p_instance->p_playlist, i_id );
-
+ p_item = playlist_ItemGetByInputId( PL, i_id,
+ PL->status.p_node );
if( !p_item )
{
- libvlc_exception_raise( p_exception, "Unable to find item " );
- return;
+ if( did_lock == 1 )
+ {
+ vlc_object_unlock( PL );
+ playlist_mark_locked( p_instance, 0 );
+ }
+ RAISEVOID( "Unable to find item" );
}
- playlist_Control( p_instance->p_playlist, PLAYLIST_VIEWPLAY,
- p_instance->p_playlist->status.i_view,
- p_view->p_root, p_item );
+ playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
+ PL->status.p_node, p_item );
+ if( did_lock == 1 )
+ {
+ vlc_object_unlock( PL );
+ playlist_mark_locked( p_instance, 0 );
+ }
}
else
{
- playlist_Play( p_instance->p_playlist );
+ playlist_Control( PL, PLAYLIST_PLAY,
+ playlist_was_locked( p_instance ) );
}
}
+void libvlc_playlist_pause( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
+{
+ assert( PL );
+ if( playlist_Control( PL, PLAYLIST_PAUSE,
+ playlist_was_locked( p_instance ) ) != VLC_SUCCESS )
+ RAISEVOID( "Empty playlist" );
+}
+
+
void libvlc_playlist_stop( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_exception )
+ libvlc_exception_t *p_e )
{
- if( playlist_Stop( p_instance->p_playlist ) != VLC_SUCCESS )
- {
- libvlc_exception_raise( p_exception, "Empty playlist" );
- }
+ assert( PL );
+ if( playlist_Control( PL, PLAYLIST_STOP,
+ playlist_was_locked( p_instance ) ) != VLC_SUCCESS )
+ RAISEVOID( "Empty playlist" );
}
void libvlc_playlist_clear( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_exception )
+ libvlc_exception_t *p_e )
+{
+ VLC_UNUSED(p_e);
+
+ assert( PL );
+ playlist_Clear( PL, playlist_was_locked( p_instance ) );
+}
+
+void libvlc_playlist_next( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
{
- playlist_Clear( p_instance->p_playlist );
+ assert( PL );
+ if( playlist_Control( PL, PLAYLIST_SKIP, playlist_was_locked( p_instance ),
+ 1 ) != VLC_SUCCESS )
+ RAISEVOID( "Empty playlist" );
+}
+
+void libvlc_playlist_prev( libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
+{
+ if( playlist_Control( PL, PLAYLIST_SKIP, playlist_was_locked( p_instance ),
+ -1 ) != VLC_SUCCESS )
+ RAISEVOID( "Empty playlist" );
}
int libvlc_playlist_add( libvlc_instance_t *p_instance, const char *psz_uri,
- const char *psz_name, libvlc_exception_t *p_exception )
+ const char *psz_name, libvlc_exception_t *p_e )
{
return libvlc_playlist_add_extended( p_instance, psz_uri, psz_name,
- 0, NULL, p_exception );
+ 0, NULL, p_e );
}
int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
const char *psz_uri, const char *psz_name,
int i_options, const char **ppsz_options,
- libvlc_exception_t *p_exception )
+ libvlc_exception_t *p_e )
{
- return playlist_AddExt( p_instance->p_playlist, psz_uri, psz_name,
+ assert( PL );
+ if( playlist_was_locked( p_instance ) )
+ {
+ libvlc_exception_raise( p_e, "You must unlock playlist before "
+ "calling libvlc_playlist_add" );
+ return VLC_EGENERIC;
+ }
+ return playlist_AddExt( PL, psz_uri, psz_name,
PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
- i_options );
+ i_options, 1, false );
}
-
-libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_exception )
+int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
+ libvlc_exception_t *p_e )
{
- libvlc_input_t *p_input;
+ assert( PL );
- vlc_mutex_lock( &p_instance->p_playlist->object_lock );
- if( p_instance->p_playlist->p_input == NULL )
+ if( playlist_DeleteFromInput( PL, i_id,
+ playlist_was_locked( p_instance ) ) )
{
- libvlc_exception_raise( p_exception, "No active input" );
- vlc_mutex_unlock( &p_instance->p_playlist->object_lock );
- return NULL;
+ libvlc_exception_raise( p_e, "deletion failed" );
+ return VLC_ENOITEM;
}
- p_input = (libvlc_input_t *)malloc( sizeof( libvlc_input_t ) );
+ return VLC_SUCCESS;
+}
+
+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);
- p_input->i_input_id = p_instance->p_playlist->p_input->i_object_id;
- p_input->p_instance = p_instance;
- vlc_mutex_unlock( &p_instance->p_playlist->object_lock );
+ 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_object_lock( PL );
+ p_instance->b_playlist_locked = 1;
+}
+
+void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
+{
+ assert( PL );
+ p_instance->b_playlist_locked = 0;
+ vlc_object_unlock( PL );
+}
+
+libvlc_media_player_t * libvlc_playlist_get_media_player(
+ libvlc_instance_t *p_instance,
+ libvlc_exception_t *p_e )
+{
+ libvlc_media_player_t *p_mi;
+ assert( PL );
+
+ 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_input;
+ return p_mi;
}
+
projects / vlc / blobdiff