X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=407dabeeeb70c6b65a5cfe414f7359928a3f9406;hb=62dd14548820fb0966e6b90d586183f74a427e4b;hp=7340e365f8634e003cca0401c586559986fbd691;hpb=1a112b8a40daf2a86ad1aa310b8eb4fe1255bdce;p=vlc

diff --git a/src/libvlc.c b/src/libvlc.c
index 7340e365f8..407dabeeeb 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -306,12 +306,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         return VLC_EGENERIC;
     }
 
-#ifdef __APPLE__
-    /* vlc_thread_set_priority needs to query the config,
-     * so this is the earliest moment where we can set this */
-    vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
-#endif
-
     /* Check for short help option */
     if( config_GetInt( p_libvlc, "help" ) > 0 )
     {
@@ -795,7 +789,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     }
     free( psz_modules );
 
-#ifdef ENABLE_SOUT
+#ifdef ENABLE_VLM
     /* Initialize VLM if vlm-conf is specified */
     psz_parser = config_GetPsz( p_libvlc, "vlm-conf" );
     if( psz_parser && *psz_parser )
@@ -962,7 +956,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     {
         playlist_t *p_playlist = pl_Yield( p_libvlc );
         playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0,
-                         -1, NULL, 0, true, false );
+                         -1, NULL, 0, true, pl_Unlocked );
         pl_Release( p_libvlc );
     }
     free( val.psz_string );
@@ -989,7 +983,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
         vlc_object_release( p_intf ); /* for vlc_object_find() */
     }
 
-#ifdef ENABLE_SOUT
+#ifdef ENABLE_VLM
     /* Destroy VLM if created in libvlc_InternalInit */
     if( priv->p_vlm )
     {
@@ -1232,8 +1226,8 @@ static inline int LoadMessages (void)
     static const char psz_path[] = LOCALEDIR;
 #else
     char psz_path[1024];
-    if (snprintf (psz_path, sizeof (psz_path), "%s/%s",
-                  vlc_global()->psz_vlcpath, "locale")
+    if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s",
+                  config_GetDataDir(), "locale")
                      >= (int)sizeof (psz_path))
         return -1;
 
@@ -1295,7 +1289,7 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[
         playlist_t *p_playlist = pl_Yield( 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, false );
+                         i_options, true, pl_Unlocked );
         pl_Release( p_vlc );
     }