X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fplaylist.c;h=79f274cda5757fe50a677005e1ac9d836776f2d6;hb=cb435e2774e43702c7b23ce9fd5bd303e300212e;hp=39f26f35df94bf55e5a8d3213386895ffc0e597e;hpb=375920365554d46e9dba43106722648d37598621;p=vlc diff --git a/src/control/playlist.c b/src/control/playlist.c index 39f26f35df..79f274cda5 100644 --- a/src/control/playlist.c +++ b/src/control/playlist.c @@ -21,158 +21,31 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include "libvlc_internal.h" +#include "libvlc.h" -#include +#include +#include +#include +#include +#include -#define PL p_instance->p_libvlc_int->p_playlist +#include -void libvlc_playlist_loop( libvlc_instance_t *p_instance, vlc_bool_t loop, - libvlc_exception_t *p_e) -{ - assert( PL ); - var_SetBool(PL,"loop",loop); -} +#include void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id, - int i_options, char **ppsz_options, - libvlc_exception_t *p_e ) + int i_options, char **ppsz_options ) { - assert( PL ); - ///\todo Handle additionnal options - - if( PL->items.i_size == 0 ) RAISEVOID( "Empty playlist" ); - if( i_id > 0 ) - { - playlist_item_t *p_item = playlist_ItemGetById( PL, i_id, VLC_TRUE ); - if( !p_item ) RAISEVOID( "Unable to find item" ); - - playlist_Control( PL, PLAYLIST_VIEWPLAY, VLC_FALSE, - PL->status.p_node, p_item ); - } - else - { - playlist_Play( PL ); - } -} - -void libvlc_playlist_pause( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - assert( PL ); - if( playlist_Pause( PL ) != VLC_SUCCESS ) - RAISEVOID( "Empty playlist" ); -} - - -void libvlc_playlist_stop( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - assert( PL ); - if( playlist_Stop( PL ) != VLC_SUCCESS ) - RAISEVOID( "Empty playlist" ); -} - -void libvlc_playlist_clear( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - assert( PL ); - playlist_Clear( PL, VLC_FALSE ); -} - -void libvlc_playlist_next( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - assert( PL ); - if( playlist_Next( PL ) != VLC_SUCCESS ) - RAISEVOID( "Empty playlist" ); -} - -void libvlc_playlist_prev( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - if( playlist_Prev( PL ) != 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_e ) -{ - return libvlc_playlist_add_extended( p_instance, psz_uri, psz_name, - 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_e ) -{ - assert( PL ); - return playlist_AddExt( PL, psz_uri, psz_name, - PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options, - i_options, 1 ); -} - -int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id, - libvlc_exception_t *p_e ) -{ - playlist_item_t *p_item; - assert( PL ); - vlc_mutex_lock( &PL->object_lock ); - p_item = playlist_ItemGetById( PL, i_id, VLC_TRUE ); - if( p_item && p_item->p_input ) { - int i_ret = playlist_DeleteFromInput( PL, p_item->p_input->i_id, VLC_TRUE ); - if( i_ret ) { - libvlc_exception_raise( p_e, "delete failed" ); - vlc_mutex_unlock( &PL->object_lock ); - return VLC_EGENERIC; - } - else { - vlc_mutex_unlock( &PL->object_lock ); - return VLC_SUCCESS; - } - } - libvlc_exception_raise( p_e, "item not found" ); - vlc_mutex_unlock( &PL->object_lock ); - return VLC_EGENERIC; -} - - -int libvlc_playlist_isplaying( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - assert( PL ); - return playlist_IsPlaying( PL ); -} - -int libvlc_playlist_items_count( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - assert( PL ); - return PL->items.i_size; -} - -libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) -{ - libvlc_input_t *p_input; - assert( PL ); - - vlc_mutex_lock( &PL->object_lock ); - if( PL->p_input == NULL ) - { - libvlc_exception_raise( p_e, "No active input" ); - vlc_mutex_unlock( &PL->object_lock ); - return NULL; - } - p_input = (libvlc_input_t *)malloc( sizeof( libvlc_input_t ) ); - - p_input->i_input_id = PL->p_input->i_object_id; - p_input->p_instance = p_instance; - vlc_mutex_unlock( &PL->object_lock ); + playlist_t *pl = libvlc_priv (p_instance->p_libvlc_int)->p_playlist; + VLC_UNUSED(i_id); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options); - return p_input; + assert( pl ); + if( pl->items.i_size == 0 ) + return; + playlist_Control( pl, PLAYLIST_PLAY, false ); }