Convert the new libvlc API (so, the one that is in src/control) not to use the old...

[vlc] / src / control / playlist.c

diff --git a/src/control/playlist.c b/src/control/playlist.c
index db597b67f29ff9380cbeb67916a36bd8da585730..f08ad122ef4da45895bf436df53b3fef6bc66a6d 100644 (file)
--- 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
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include <libvlc_internal.h>
@@ -26,37 +26,130 @@
 
 #include <vlc/intf.h>
 
-void libvlc_playlist_play( libvlc_instance_t *p_instance,
+#include <assert.h>
+
+#define PL p_instance->p_libvlc_int->p_playlist
+
+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 )
 {
+    assert( PL );
     ///\todo Handle additionnal options
 
-    if( p_instance->p_playlist->i_size == 0 )
+    if( PL->i_size == 0 ) RAISEVOID( "Empty playlist" );
+    if( i_id > 0 )
+    {
+        playlist_item_t *p_item = playlist_ItemGetById( PL,
+                                                        i_id );
+        if( !p_item ) RAISEVOID( "Unable to find item" );
+
+        playlist_LockControl( PL, PLAYLIST_VIEWPLAY,
+                              PL->status.p_node, p_item );
+    }
+    else
     {
-        libvlc_exception_raise( p_exception, "Empty playlist" );
-        return;
+        playlist_Play( PL );
     }
-    playlist_Play( p_instance->p_playlist );
+}
+
+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 );
+}
+
+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_PlaylistAddExt( PL, psz_uri, psz_name,
+                            PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
+                            i_options );
+}
+
+int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
+                                 libvlc_exception_t *p_e )
+{
+    assert( PL );
+    return playlist_DeleteFromItemId( PL, i_id );
+}
+
+
+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->i_size;
 }
 
 libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
-                                            libvlc_exception_t *p_exception )
+                                            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 )
+    vlc_mutex_lock( &PL->object_lock );
+    if( PL->p_input == NULL )
     {
-        libvlc_exception_raise( p_exception, "No active input" );
-        vlc_mutex_unlock( &p_instance->p_playlist->object_lock );
-        return;
+        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 = p_instance->p_playlist->p_input->i_object_id;
+    p_input->i_input_id = PL->p_input->i_object_id;
     p_input->p_instance = p_instance;
-    vlc_mutex_unlock( &p_instance->p_playlist->object_lock );
+    vlc_mutex_unlock( &PL->object_lock );
 
     return p_input;
 }