* Copyright (C) 2005 the VideoLAN team
* $Id$
*
- * Authors: Cl�ent Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <libvlc_internal.h>
+#include "libvlc_internal.h"
+#include "libvlc.h"
+
+#include <vlc/libvlc_structures.h>
#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
+#include <vlc/deprecated.h>
+
+#include <vlc_playlist.h>
-#include <vlc/intf.h>
+#include <assert.h>
-void libvlc_playlist_play( libvlc_instance_t *p_instance,
+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 )
{
- ///\todo Handle additionnal options
+ playlist_t *pl = libvlc_priv (p_instance->p_libvlc_int)->p_playlist;
+ VLC_UNUSED(i_id); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
- if( p_instance->p_playlist->i_size == 0 )
- {
- libvlc_exception_raise( p_exception, "Empty playlist" );
+ assert( pl );
+ if( pl->items.i_size == 0 )
return;
- }
- playlist_Play( p_instance->p_playlist );
-}
-
-libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_exception )
-{
- libvlc_input_t *p_input;
-
- vlc_mutex_lock( &p_instance->p_playlist->object_lock );
- if( p_instance->p_playlist->p_input == NULL )
- {
- libvlc_exception_raise( p_exception, "No active input" );
- vlc_mutex_unlock( &p_instance->p_playlist->object_lock );
- return NULL;
- }
- p_input = (libvlc_input_t *)malloc( sizeof( libvlc_input_t ) );
-
- 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 );
-
- return p_input;
+ playlist_Control( pl, PLAYLIST_PLAY, false );
}