s/pl_Yield/pl_Hold/

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 5445183b3ecb7929d466462a27071004e9e1bac2..4fce0d9c358bff3b1c2f48e0b1b468fba435aa54 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1013,7 +1013,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_Get( p_libvlc, "open", &val );
     if ( val.psz_string != NULL && *val.psz_string )
     {
-        playlist_t *p_playlist = pl_Yield( p_libvlc );
+        playlist_t *p_playlist = pl_Hold( p_libvlc );
         playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0,
                          -1, NULL, 0, true, pl_Unlocked );
         pl_Release( p_libvlc );
@@ -1056,10 +1056,10 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     playlist_ServicesDiscoveryKillAll( p_playlist );
 
     /* Free playlist */
-    /* Any thread still running must not assume pl_Yield() succeeds. */
+    /* Any thread still running must not assume pl_Hold() succeeds. */
     msg_Dbg( p_libvlc, "removing playlist" );
     priv->p_playlist = NULL;
-    vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Yield() */
+    vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Hold() */
     vlc_thread_join( p_playlist );
     vlc_object_release( p_playlist );
 
@@ -1309,7 +1309,7 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[
         /* TODO: write an internal function of this one, to avoid
          *       unnecessary lookups. */
 
-        playlist_t *p_playlist = pl_Yield( p_vlc );
+        playlist_t *p_playlist = pl_Hold( p_vlc );
         playlist_AddExt( p_playlist, ppsz_argv[i_opt], NULL, PLAYLIST_INSERT,
                          0, -1, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ),
                          i_options, true, pl_Unlocked );