libvlc: Don't lock the media player twice in set_media().

[vlc] / src / control / media.c

diff --git a/src/control/media.c b/src/control/media.c
index e082e1a94ea77e28cf1202636a218cb0dc10af1a..0b6147ef0680cc8f07598530c70dd54d41585072 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -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;
     }
 }
@@ -348,24 +348,21 @@ libvlc_media_t * libvlc_media_new_as_node( libvlc_instance_t *p_instance,
  *
  * 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 );
 }
 
 /**************************************************************************
@@ -450,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 */