[vlc-commits] modules: always load modules with callbacks for the time being

Rémi Denis-Courmont git at videolan.org
Sun Aug 19 23:11:25 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 19 23:22:06 2012 +0300| [549e3f43e927366152476dca76df574625d141d3] | committer: Rémi Denis-Courmont

modules: always load modules with callbacks for the time being

Until config_GetPszChoices() learns to load modules when needed, any
module with a list callback must be loaded at all times.

The code previously assumed that plugins with list callbacks also had
action callbacks. This is not true.

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

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

diff --git a/src/modules/bank.c b/src/modules/bank.c
index 48c8e34..1f5fcec 100644
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -486,11 +486,10 @@ static int AllocatePluginFile (module_bank_t *bank, const char *abspath,
         module->b_loaded = false;
     }
 
-    /* For now we force loading if the module's config contains
-     * callbacks or actions.
+    /* 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].i_action)
+         if (module->p_config[i].pf_update_list != NULL)
          {
              /* !unloadable not allowed for plugins with callbacks */
              vlc_module_destroy (module);



More information about the vlc-commits mailing list