Libvlc: Use exception for internal function.

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 6f2e5f3a2fc66b8605d4b7d724270ce3936ba2c1..079c827499977e8143146ca135292c5313d9d2a8 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -99,10 +99,10 @@ VLC_EXPORT (input_thread_t *, libvlc_get_input_thread,
                         ( struct libvlc_media_instance_t *, libvlc_exception_t * ) );
 
 VLC_EXPORT (libvlc_media_instance_t *, libvlc_media_instance_new_from_input_thread,
-                        ( struct libvlc_instance_t *, input_thread_t * ) );
+                        ( struct libvlc_instance_t *, input_thread_t *, libvlc_exception_t * ) );
 
 VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_item,
-                        ( struct libvlc_instance_t *, input_item_t * ) );
+                        ( struct libvlc_instance_t *, input_item_t *, libvlc_exception_t * ) );
 
 VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate,
                         ( libvlc_media_descriptor_t * ) );

diff --git a/src/control/media_descriptor.c b/src/control/media_descriptor.c
index 5ba6ca40da7b22d6ad159cfceaa68c2f59666024..b13d6a2c4db6dc32b609ad34e852d116bd5f8ba7 100644 (file)
--- a/src/control/media_descriptor.c
+++ b/src/control/media_descriptor.c
@@ -75,7 +75,8 @@ libvlc_media_descriptor_t * libvlc_media_descriptor_new(
  **************************************************************************/
 libvlc_media_descriptor_t * libvlc_media_descriptor_new_from_input_item(
                                    libvlc_instance_t *p_instance,
-                                   input_item_t *p_input_item )
+                                   input_item_t *p_input_item,
+                                   libvlc_exception_t *p_e )
 {
     libvlc_media_descriptor_t * p_media_desc;
 

diff --git a/src/control/media_instance.c b/src/control/media_instance.c
index cb306613567b0aa8e8b6e6efa42bf8bc101b5361..71a1c5955a0d2b1ce9d8a9ddebe96a31ded471de 100644 (file)
--- a/src/control/media_instance.c
+++ b/src/control/media_instance.c
@@ -72,14 +72,22 @@ libvlc_media_instance_new( libvlc_media_descriptor_t *p_md )
  **************************************************************************/
 libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread(
                                    struct libvlc_instance_t *p_libvlc_instance,
-                                   input_thread_t *p_input )
+                                   input_thread_t *p_input,
+                                   libvlc_exception_t *p_e )
 {
     libvlc_media_instance_t * p_mi;
 
     p_mi = malloc( sizeof(libvlc_media_instance_t) );
     p_mi->p_md = libvlc_media_descriptor_new_from_input_item(
                     p_libvlc_instance,
-                    p_input->p->input.p_item );
+                    p_input->p->input.p_item, p_e );
+
+    if( libvlc_exception_raised( p_e ) )
+    {
+        free( p_mi );
+        return NULL;
+    }
+
     p_mi->p_libvlc_instance = p_libvlc_instance;
     p_mi->i_input_id = p_input->i_object_id;
 

diff --git a/src/control/playlist.c b/src/control/playlist.c
index c5a085a6634e1f4283f541748df83afe9db54504..eaa60d0def512f9ee56eab0c4b9f99d807dc9b9c 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -220,7 +220,7 @@ libvlc_media_instance_t * libvlc_playlist_get_media_instance(
 
     vlc_mutex_lock( &PL->object_lock );
     p_mi = libvlc_media_instance_new_from_input_thread(
-                        p_instance, PL->p_input );
+                        p_instance, PL->p_input, p_e );
     vlc_mutex_unlock( &PL->object_lock );
 
     return p_mi;