testapi.c: Fix a warning plus small clean up.

[vlc] / src / control / playlist.c

diff --git a/src/control/playlist.c b/src/control/playlist.c
index 988721f68014da6ec23d868ebe2dc77573edc09e..74af3f50edf9055741677d7ba369f87545ee004c 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include "libvlc_internal.h"
+
 #include <vlc/libvlc.h>
 #include <vlc_playlist.h>
 
@@ -48,9 +49,11 @@ static inline void playlist_mark_locked( libvlc_instance_t *p_instance,
     vlc_mutex_unlock( &p_instance->instance_lock );
 }
 
-void libvlc_playlist_loop( libvlc_instance_t *p_instance, vlc_bool_t loop,
+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 );
 }
@@ -59,6 +62,8 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
                            int i_options, char **ppsz_options,
                            libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     int did_lock = 0;
     assert( PL );
     ///\todo Handle additionnal options
@@ -123,6 +128,8 @@ void libvlc_playlist_stop( libvlc_instance_t *p_instance,
 void libvlc_playlist_clear( libvlc_instance_t *p_instance,
                             libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     assert( PL );
     playlist_Clear( PL, playlist_was_locked( p_instance ) );
 }
@@ -186,6 +193,8 @@ int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
 int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
                                libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     assert( PL );
     return playlist_IsPlaying( PL );
 }
@@ -193,6 +202,8 @@ int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
 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 );
 }
@@ -211,26 +222,27 @@ void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
     vlc_mutex_unlock( &PL->object_lock );
 }
 
-
-
-libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
-                                            libvlc_exception_t *p_e )
+libvlc_media_instance_t * libvlc_playlist_get_media_instance(
+                                libvlc_instance_t *p_instance,
+                                libvlc_exception_t *p_e )
 {
-    libvlc_input_t *p_input;
+    libvlc_media_instance_t *p_mi;
     assert( PL );
 
     vlc_mutex_lock( &PL->object_lock );
-    if( PL->p_input == NULL )
+    if( PL->p_input )
+    {
+        p_mi = libvlc_media_instance_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_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 );
 
-    return p_input;
+    return p_mi;
 }
+