LibVLC: hopefully fix media player callback dead lock (fixes #3307)

[vlc] / src / control / media.c

diff --git a/src/control/media.c b/src/control/media.c
index 54f2f145d6c48ad7be2b0486f536d91c31ce7345..0b6147ef0680cc8f07598530c70dd54d41585072 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -96,17 +96,17 @@ static void input_item_subitem_added( const vlc_event_t *p_event,
 
     p_md_child = libvlc_media_new_from_input_item(
                 p_md->p_libvlc_instance,
-                p_event->u.input_item_subitem_added.p_new_child, NULL );
+                p_event->u.input_item_subitem_added.p_new_child );
 
     /* Add this to our media list */
     if( !p_md->p_subitems )
     {
-        p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
+        p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
         libvlc_media_list_set_media( p_md->p_subitems, p_md );
     }
     if( p_md->p_subitems )
     {
-        libvlc_media_list_add_media( p_md->p_subitems, p_md_child, NULL );
+        libvlc_media_list_add_media( p_md->p_subitems, p_md_child );
     }
 
     /* Construct the event */
@@ -228,7 +228,7 @@ static void preparse_if_needed( libvlc_media_t *p_md )
     {
         playlist_PreparseEnqueue(
                 libvlc_priv (p_md->p_libvlc_instance->p_libvlc_int)->p_playlist,
-                p_md->p_input_item, pl_Unlocked );
+                p_md->p_input_item );
         p_md->b_preparsed = true;
     }
 }
@@ -240,14 +240,12 @@ static void preparse_if_needed( libvlc_media_t *p_md )
  **************************************************************************/
 libvlc_media_t * libvlc_media_new_from_input_item(
                                    libvlc_instance_t *p_instance,
-                                   input_item_t *p_input_item,
-                                   libvlc_exception_t *p_e )
+                                   input_item_t *p_input_item )
 {
     libvlc_media_t * p_md;
 
     if (!p_input_item)
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "No input item given" );
         return NULL;
     }
@@ -255,7 +253,6 @@ libvlc_media_t * libvlc_media_new_from_input_item(
     p_md = calloc( 1, sizeof(libvlc_media_t) );
     if( !p_md )
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Not enough memory" );
         return NULL;
     }
@@ -297,10 +294,8 @@ libvlc_media_t * libvlc_media_new_from_input_item(
 /**************************************************************************
  * Create a new media descriptor object
  **************************************************************************/
-libvlc_media_t * libvlc_media_new(
-                                   libvlc_instance_t *p_instance,
-                                   const char * psz_mrl,
-                                   libvlc_exception_t *p_e )
+libvlc_media_t * libvlc_media_new( libvlc_instance_t *p_instance,
+                                   const char * psz_mrl )
 {
     input_item_t * p_input_item;
     libvlc_media_t * p_md;
@@ -309,13 +304,11 @@ libvlc_media_t * libvlc_media_new(
 
     if (!p_input_item)
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Not enough memory" );
         return NULL;
     }
 
-    p_md = libvlc_media_new_from_input_item( p_instance,
-                p_input_item, p_e );
+    p_md = libvlc_media_new_from_input_item( p_instance, p_input_item );
 
     /* The p_input_item is retained in libvlc_media_new_from_input_item */
     vlc_gc_decref( p_input_item );
@@ -326,10 +319,8 @@ libvlc_media_t * libvlc_media_new(
 /**************************************************************************
  * Create a new media descriptor object
  **************************************************************************/
-libvlc_media_t * libvlc_media_new_as_node(
-                                   libvlc_instance_t *p_instance,
-                                   const char * psz_name,
-                                   libvlc_exception_t *p_e )
+libvlc_media_t * libvlc_media_new_as_node( libvlc_instance_t *p_instance,
+                                           const char * psz_name )
 {
     input_item_t * p_input_item;
     libvlc_media_t * p_md;
@@ -338,15 +329,13 @@ libvlc_media_t * libvlc_media_new_as_node(
 
     if (!p_input_item)
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Not enough memory" );
         return NULL;
     }
 
-    p_md = libvlc_media_new_from_input_item( p_instance,
-                p_input_item, p_e );
+    p_md = libvlc_media_new_from_input_item( p_instance, p_input_item );
 
-    p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
+    p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
 
     return p_md;
 }
@@ -359,24 +348,21 @@ libvlc_media_t * libvlc_media_new_as_node(
  *
  * The options are detailled in vlc --long-help, for instance "--sout-all"
  **************************************************************************/
-void libvlc_media_add_option(
-                                   libvlc_media_t * p_md,
-                                   const char * psz_option )
+void libvlc_media_add_option( libvlc_media_t * p_md,
+                              const char * psz_option )
 {
-    input_item_AddOption( p_md->p_input_item, psz_option,
+    libvlc_media_add_option_flag( p_md, psz_option,
                           VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED );
 }
 
 /**************************************************************************
  * Same as libvlc_media_add_option but with configurable flags.
  **************************************************************************/
-void libvlc_media_add_option_flag(
-                                   libvlc_media_t * p_md,
+void libvlc_media_add_option_flag( libvlc_media_t * p_md,
                                    const char * ppsz_option,
-                                   libvlc_media_option_t i_flags )
+                                   unsigned i_flags )
 {
-    input_item_AddOption( p_md->p_input_item, ppsz_option,
-                          i_flags );
+    input_item_AddOption( p_md->p_input_item, ppsz_option, i_flags );
 }
 
 /**************************************************************************
@@ -427,7 +413,7 @@ libvlc_media_t *
 libvlc_media_duplicate( libvlc_media_t *p_md_orig )
 {
     return libvlc_media_new_from_input_item(
-        p_md_orig->p_libvlc_instance, p_md_orig->p_input_item, NULL );
+        p_md_orig->p_libvlc_instance, p_md_orig->p_input_item );
 }
 
 /**************************************************************************
@@ -461,7 +447,7 @@ char *libvlc_media_get_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta )
         p_md->has_asked_art = true;
         playlist_AskForArtEnqueue(
                 libvlc_priv(p_md->p_libvlc_instance->p_libvlc_int)->p_playlist,
-                p_md->p_input_item, pl_Unlocked );
+                p_md->p_input_item );
     }
 
     /* Should be integrated in core */
@@ -585,13 +571,12 @@ libvlc_media_event_manager( libvlc_media_t * p_md )
  * Get duration of media object (in ms)
  **************************************************************************/
 int64_t
-libvlc_media_get_duration( libvlc_media_t * p_md, libvlc_exception_t *p_e )
+libvlc_media_get_duration( libvlc_media_t * p_md )
 {
     assert( p_md );
 
     if( !p_md->p_input_item )
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "No input item" );
         return -1;
     }
@@ -673,6 +658,7 @@ libvlc_media_get_es( libvlc_media_t *p_md, libvlc_media_es_t ** pp_es )
 
 
         p_mes->i_codec = p_es->i_codec;
+        p_mes->i_id = p_es->i_id;
 
         p_mes->i_profile = p_es->i_profile;
         p_mes->i_level = p_es->i_level;