[vlc-commits] modules: do not unload modules during initialization

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 25 23:21:11 2016 +0300| [d90c880df5c327a64fbaf2abf22ab911faa976b9] | committer: Rémi Denis-Courmont

modules: do not unload modules during initialization

This is needed for the next changes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d90c880df5c327a64fbaf2abf22ab911faa976b9
---

 src/modules/bank.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/modules/bank.c b/src/modules/bank.c
index 3668aa9..8e64861 100644
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -203,17 +203,11 @@ static int AllocatePluginFile (module_bank_t *bank, const char *abspath,
     /* We have not already scanned and inserted this module */
     assert (module->next == NULL);
 
-    /* Unload plugin until we really need it */
-    if (module->b_loaded && module->b_unloadable)
-    {
-        module_Unload (module->handle);
-        module->b_loaded = false;
-    }
-
     /* For now we force loading if the module's config contains callbacks.
      * Could be optimized by adding an API call.*/
     for (size_t n = module->confsize, i = 0; i < n; i++)
-         if (module->p_config[i].list_count == 0
+         if (!module->b_loaded
+          && module->p_config[i].list_count == 0
           && (module->p_config[i].list.psz_cb != NULL || module->p_config[i].list.i_cb != NULL))
          {
              /* !unloadable not allowed for plugins with callbacks */