Remove the old module config lock

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 2c7345e963e6a3ddd895763b215b82ee38355f4a..dbe3280cfd3b3221d968499cddfb8be90d22f59f 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -178,7 +178,6 @@ struct module_config_t
     int            i_action;                           /* actions list size */
 
     /* Misc */
-    vlc_mutex_t *p_lock;           /* Lock to use when modifying the config */
     bool        b_dirty;          /* Dirty flag to indicate a config change */
     bool        b_advanced;          /* Flag to indicate an advanced option */
     bool        b_internal;   /* Flag to indicate option is not to be shown */

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 9a3fb36b25e28caeef586a10a49d0a3dd1d46ee1..46389f63bfd865a5180e541fc2e450806606a05a 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -392,8 +392,6 @@ static int CacheLoadConfig( module_t *p_module, FILE *file )
 
         p_module->p_config[i].b_dirty = false;
 
-        p_module->p_config[i].p_lock = &p_module->lock;
-
         if( p_module->p_config[i].i_list )
         {
             if( p_module->p_config[i].ppsz_list )

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 1b5dba6f4f889fcd673f095de218aa3ed1e88fa8..de6312f07bcb44d5c1d94ac5128ec0e97849b853 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -37,7 +37,6 @@ static void vlc_module_destruct (gc_object_t *obj)
 {
     module_t *module = vlc_priv (obj, module_t);
 
-    vlc_mutex_destroy (&module->lock);
     free (module->psz_object_name);
     free (module);
 }
@@ -56,7 +55,6 @@ module_t *vlc_module_create (vlc_object_t *obj)
     module->parent = NULL;
     module->submodule_count = 0;
     vlc_gc_init (module, vlc_module_destruct);
-    vlc_mutex_init (&module->lock);
 
     module->psz_shortname = NULL;
     module->psz_longname = (char*)default_name;
@@ -135,7 +133,6 @@ static module_config_t *vlc_config_create (module_t *module, int type)
 
     memset (tab + confsize, 0, sizeof (tab[confsize]));
     tab[confsize].i_type = type;
-    tab[confsize].p_lock = &module->lock;
 
     if (type & CONFIG_ITEM)
     {

diff --git a/src/modules/modules.h b/src/modules/modules.h
index c4a5eeebd7f92a3d988c1daf7f89d27d44d23b26..6d79ba9186e3d0db1a2489f2632a98662835b2cd 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -102,7 +102,6 @@ struct module_t
     module_t   *parent;
     unsigned    submodule_count;
     gc_object_t vlc_gc_data;
-    vlc_mutex_t lock;
 
     /*
      * Variables set by the module to identify itself