X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fmodules.h;h=cc2207bbb9325ff7d3c8777b6c0e689ed8e28eca;hb=c10a4dce37c91443dba16de23bf9a4905c09a50e;hp=7b235593af5cce29855c8a1172f0f34cd0eea270;hpb=f44ed771d0d280f76d8a8bb9f0001e9ae831bdaf;p=vlc

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 7b235593af..cc2207bbb9 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -2,7 +2,7 @@
  * modules.h : Module management functions.
  *****************************************************************************
  * Copyright (C) 2001 the VideoLAN team
- * $Id: modules.h 17958 2006-11-22 17:13:24Z courmisch $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -43,14 +43,13 @@ struct module_bank_t
 
     int              i_usage;
 
-    vlc_bool_t       b_main;
-    vlc_bool_t       b_builtins;
-    vlc_bool_t       b_plugins;
+    bool             b_builtins;
+    bool             b_plugins;
 
     /* Plugins cache */
-    vlc_bool_t     b_cache;
-    vlc_bool_t     b_cache_dirty;
-    vlc_bool_t     b_cache_delete;
+    bool             b_cache;
+    bool             b_cache_dirty;
+    bool             b_cache_delete;
 
     int            i_cache;
     module_cache_t **pp_cache;
@@ -68,15 +67,14 @@ struct module_cache_t
     char       *psz_file;
     int64_t    i_time;
     int64_t    i_size;
-    vlc_bool_t b_junk;
+    bool b_junk;
 
     /* Optional extra data */
     module_t *p_module;
-    vlc_bool_t b_used;
+    bool b_used;
 };
 
 
-#if 0
 #define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
@@ -105,20 +103,20 @@ struct module_t
     /*
      * Variables set by the module to identify itself
      */
-    const char *psz_shortname;                              /**< Module name */
-    const char *psz_longname;                   /**< Module descriptive name */
-    const char *psz_help;        /**< Long help string for "special" modules */
+    char *psz_shortname;                              /**< Module name */
+    char *psz_longname;                   /**< Module descriptive name */
+    char *psz_help;        /**< Long help string for "special" modules */
 
     /** Shortcuts to the module */
-    const char *pp_shortcuts[ MODULE_SHORTCUT_MAX ];
+    char *pp_shortcuts[ MODULE_SHORTCUT_MAX ];
 
     char    *psz_capability;                                 /**< Capability */
     int      i_score;                          /**< Score for the capability */
     uint32_t i_cpu;                           /**< Required CPU capabilities */
 
-    vlc_bool_t b_unloadable;                        /**< Can we be dlclosed? */
-    vlc_bool_t b_reentrant;                           /**< Are we reentrant? */
-    vlc_bool_t b_submodule;                        /**< Is this a submodule? */
+    bool b_unloadable;                        /**< Can we be dlclosed? */
+    bool b_reentrant;                           /**< Are we reentrant? */
+    bool b_submodule;                        /**< Is this a submodule? */
 
     /* Callbacks */
     int  ( * pf_activate )   ( vlc_object_t * );
@@ -139,10 +137,9 @@ struct module_t
     module_handle_t     handle;                             /* Unique handle */
     char *              psz_filename;                     /* Module filename */
 
-    vlc_bool_t          b_builtin;  /* Set to true if the module is built in */
-    vlc_bool_t          b_loaded;        /* Set to true if the dll is loaded */
+    bool          b_builtin;  /* Set to true if the module is built in */
+    bool          b_loaded;        /* Set to true if the dll is loaded */
 };
-#endif
 
 
 #define module_InitBank(a)     __module_InitBank(VLC_OBJECT(a))
@@ -156,7 +153,7 @@ void  __module_EndBank         ( vlc_object_t * );
 #define module_ResetBank(a)    __module_ResetBank(VLC_OBJECT(a))
 void  __module_ResetBank       ( vlc_object_t * );
 
-/* Low-level OS-dependant handler */
+/* Low-level OS-dependent handler */
 int  module_Call   (module_t *);
 int  module_Load   (vlc_object_t *, const char *, module_handle_t *);
 void module_Unload (module_handle_t);
@@ -165,6 +162,6 @@ void module_Unload (module_handle_t);
 void   CacheMerge (vlc_object_t *, module_t *, module_t *);
 void   CacheLoad  (vlc_object_t * );
 void   CacheSave  (vlc_object_t * );
-module_cache_t * CacheFind (vlc_object_t *, const char *, int64_t, int64_t);
+module_cache_t * CacheFind (const char *, int64_t, int64_t);
 
 #endif /* !__LIBVLC_MODULES_H */