diff --git a/src/config/core.c b/src/config/core.c index 644be42dd4e74ba4a157fffb6e0795ef4b89ea87..0faebe2db578a6baf8ee99470bc99ab04b5b803f 100644 --- a/src/config/core.c +++ b/src/config/core.c @@ -512,9 +512,6 @@ void config_ResetAll( vlc_object_t *p_this ) vlc_rwlock_wrlock (&config_lock); for (size_t j = 0; (p_module = list[j]) != NULL; j++) - { - if( p_module->b_submodule ) continue; - for (size_t i = 0; i < p_module->confsize; i++ ) { module_config_t *p_config = p_module->p_config + i; @@ -532,7 +529,6 @@ void config_ResetAll( vlc_object_t *p_this ) strdupnull (p_config->orig.psz); } } - } vlc_rwlock_unlock (&config_lock); module_list_free (list); diff --git a/src/modules/entry.c b/src/modules/entry.c index 3dbac620c75b1e4915c92198b7c44ccd49842f2c..7660fd1775f0f1b2cd064e0ff45058dda3c2e61a 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -66,7 +66,6 @@ module_t *vlc_module_create (vlc_object_t *obj) module->psz_capability = (char*)""; module->i_score = 1; module->b_unloadable = true; - module->b_submodule = false; module->pf_activate = NULL; module->pf_deactivate = NULL; module->p_config = NULL; @@ -117,7 +116,6 @@ module_t *vlc_submodule_create (module_t *module) submodule->psz_longname = module->psz_longname; submodule->psz_capability = module->psz_capability; submodule->i_score = module->i_score; - submodule->b_submodule = true; submodule->domain = module->domain; return submodule; } diff --git a/src/modules/modules.c b/src/modules/modules.c index 4730661cc0d0beb2973a15382eeaaa193c33850b..6ddbb88e7b48514a512ea6c316a1a8036de2e14b 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -563,7 +563,7 @@ found_shortcut: module_t *p_cand = p_list[i].p_module; #ifdef HAVE_DYNAMIC_PLUGINS /* Make sure the module is loaded in mem */ - module_t *p_real = p_cand->b_submodule ? p_cand->parent : p_cand; + module_t *p_real = p_cand->parent ? p_cand->parent : p_cand; if( !p_real->b_builtin && !p_real->b_loaded ) { diff --git a/src/modules/modules.h b/src/modules/modules.h index d450409d1e54a68f5eff38a555a4c795f6589de5..6523d153a356d4f43cc06aba4c2b31821b182e0f 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -111,7 +111,6 @@ struct module_t bool b_builtin; /* Set to true if the module is built in */ bool b_loaded; /* Set to true if the dll is loaded */ bool b_unloadable; /**< Can we be dlclosed? */ - bool b_submodule; /**< Is this a submodule? */ /* Callbacks */ void *pf_activate;