Add some const

[vlc] / src / modules / modules.h

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 84ee02c1317cdf69dd960caec09b5116b8dfe0cf..7469832f3ee299b7f3628b3b89f28eb1e00a185d 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -41,9 +41,6 @@ struct module_bank_t
 {
     unsigned         i_usage;
 
-    bool             b_builtins;
-    bool             b_plugins;
-
     /* Plugins cache */
     bool             b_cache;
     bool             b_cache_dirty;
@@ -66,18 +63,16 @@ struct module_cache_t
     char       *psz_file;
     int64_t    i_time;
     int64_t    i_size;
-    bool b_junk;
 
     /* Optional extra data */
     module_t *p_module;
-    bool b_used;
 };
 
 
 #define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
-#if defined(HAVE_DL_DYLD)
+#if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
 #   if defined (HAVE_MACH_O_DYLD_H)
 #       include <mach-o/dyld.h>
 #   endif
@@ -103,7 +98,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
@@ -117,10 +111,8 @@ struct module_t
 
     char    *psz_capability;                                 /**< Capability */
     int      i_score;                          /**< Score for the capability */
-    uint32_t i_cpu;                           /**< Required CPU capabilities */
 
     bool b_unloadable;                        /**< Can we be dlclosed? */
-    bool b_reentrant;                           /**< Are we reentrant? */
     bool b_submodule;                        /**< Is this a submodule? */
 
     /* Callbacks */
@@ -141,6 +133,7 @@ struct module_t
     /* Plugin-specific stuff */
     module_handle_t     handle;                             /* Unique handle */
     char *              psz_filename;                     /* Module filename */
+    char *              domain;                            /* gettext domain */
 
     bool          b_builtin;  /* Set to true if the module is built in */
     bool          b_loaded;        /* Set to true if the dll is loaded */
@@ -151,10 +144,12 @@ module_t *vlc_submodule_create (module_t *module);
 
 #define module_InitBank(a)     __module_InitBank(VLC_OBJECT(a))
 void  __module_InitBank        ( vlc_object_t * );
-void module_LoadPlugins( vlc_object_t *, bool );
-#define module_LoadPlugins(a,b) module_LoadPlugins(VLC_OBJECT(a),b)
-#define module_EndBank(a)      __module_EndBank(VLC_OBJECT(a))
-void  __module_EndBank         ( vlc_object_t * );
+void module_LoadPlugins( vlc_object_t * );
+#define module_LoadPlugins(a) module_LoadPlugins(VLC_OBJECT(a))
+void module_EndBank( vlc_object_t *, bool );
+#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b)
+
+int vlc_bindtextdomain (const char *);
 
 /* Low-level OS-dependent handler */
 int  module_Load   (vlc_object_t *, const char *, module_handle_t *);
@@ -163,7 +158,8 @@ void module_Unload (module_handle_t);
 
 /* Plugins cache */
 void   CacheMerge (vlc_object_t *, module_t *, module_t *);
-void   CacheLoad  (vlc_object_t *, module_bank_t *, bool);
+void   CacheDelete(vlc_object_t *, const char *);
+void   CacheLoad  (vlc_object_t *, module_bank_t *, const char *);
 void   CacheSave  (vlc_object_t *, module_bank_t *);
 module_cache_t * CacheFind (module_bank_t *, const char *, int64_t, int64_t);