X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcontrol%2Fplaylist.c;h=79f274cda5757fe50a677005e1ac9d836776f2d6;hb=2241aa2262c92732958fa19f3866a0258cfafc69;hp=fa6bebeddd57a7e9d92f5ecca8485e0bca4d6b71;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/src/control/playlist.c b/src/control/playlist.c
index fa6bebeddd..79f274cda5 100644
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
- * Authors: Clément 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
@@ -21,42 +21,31 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <libvlc_internal.h>
-#include <vlc/libvlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include <vlc/intf.h>
+#include "libvlc_internal.h"
+#include "libvlc.h"
 
-void libvlc_playlist_play( libvlc_instance_t *p_instance,
-                           int i_options, char **ppsz_options,
-                           libvlc_exception_t *p_exception )
-{
-    ///\todo Handle additionnal options
+#include <vlc/libvlc_structures.h>
+#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
+#include <vlc/deprecated.h>
 
-    if( p_instance->p_playlist->i_size == 0 )
-    {
-        libvlc_exception_raise( p_exception, "Empty playlist" );
-        return;
-    }
-    playlist_Play( p_instance->p_playlist );
-}
+#include <vlc_playlist.h>
+
+#include <assert.h>
 
-libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
-                                            libvlc_exception_t *p_exception )
+void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
+                           int i_options, char **ppsz_options )
 {
-    libvlc_input_t *p_input;
+    playlist_t *pl = libvlc_priv (p_instance->p_libvlc_int)->p_playlist;
+    VLC_UNUSED(i_id); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
 
-    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 );
+    assert( pl );
+    if( pl->items.i_size == 0 )
         return;
-    }
-    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 );
 }