src: use vlc_strerror_c() for log messages

[vlc] / src / modules / bank.c

diff --git a/src/modules/bank.c b/src/modules/bank.c
index cb2225da7b2c7765621753ca2069467ccd2ff675..ea3ee5d1e0107f288f5fe1b8a6f2c7f6a7ddf2d9 100644 (file)
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -104,12 +104,12 @@ void module_InitBank (void)
 
     if (modules.usage == 0)
     {
-        /* Fills the module bank structure with the main module infos.
-         * This is very useful as it will allow us to consider the main
+        /* Fills the module bank structure with the core module infos.
+         * This is very useful as it will allow us to consider the core
          * library just as another module, and for instance the configuration
-         * options of main will be available in the module bank structure just
+         * options of core will be available in the module bank structure just
          * as for every other module. */
-        module_t *module = module_InitStatic (vlc_entry__main);
+        module_t *module = module_InitStatic (vlc_entry__core);
         if (likely(module != NULL))
             module_StoreBank (module);
         config_SortConfig ();
@@ -119,7 +119,7 @@ void module_InitBank (void)
     /* We do retain the module bank lock until the plugins are loaded as well.
      * This is ugly, this staged loading approach is needed: LibVLC gets
      * some configuration parameters relevant to loading the plugins from
-     * the main (builtin) module. The module bank becomes shared read-only data
+     * the core (builtin) module. The module bank becomes shared read-only data
      * once it is ready, so we need to fully serialize initialization.
      * DO NOT UNCOMMENT the following line unless you managed to squeeze
      * module_LoadPlugins() before you unlock the mutex. */
@@ -317,6 +317,10 @@ static void AllocateAllPlugins (vlc_object_t *p_this)
     else
         mode = CACHE_USE;
 
+#if VLC_WINSTORE_APP
+    /* Windows Store Apps can not load external plugins with absolute paths. */
+    AllocatePluginPath (p_this, "plugins", mode);
+#else
     /* Contruct the special search path for system that have a relocatable
      * executable. Set it to <vlc path>/plugins. */
     char *vlcpath = config_GetLibDir ();
@@ -327,6 +331,7 @@ static void AllocateAllPlugins (vlc_object_t *p_this)
         free( paths );
     }
     free (vlcpath);
+#endif /* VLC_WINSTORE_APP */
 
     /* If the user provided a plugin path, we add it to the list */
     paths = getenv( "VLC_PLUGIN_PATH" );