Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / modules / modules.h

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 158485045e8aaabe94172420e992518b779c32f5..60b00eee01a83149e705f696f38019085381b375 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -28,10 +28,6 @@
 #ifndef LIBVLC_MODULES_H
 # define LIBVLC_MODULES_H 1
 
-
-/* Number of tries before we unload an unused module */
-#define MODULE_HIDE_DELAY 50
-
 /*****************************************************************************
  * module_bank_t: the module bank
  *****************************************************************************
@@ -69,7 +65,7 @@ struct module_cache_t
 };
 
 
-#define MODULE_SHORTCUT_MAX 50
+#define MODULE_SHORTCUT_MAX 20
 
 /* The module handle type. */
 #if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
@@ -93,11 +89,16 @@ typedef shl_t module_handle_t;
 struct module_t
 {
     char       *psz_object_name;
+    gc_object_t vlc_gc_data;
+
     module_t   *next;
-    module_t   *submodule;
     module_t   *parent;
+    module_t   *submodule;
     unsigned    submodule_count;
-    gc_object_t vlc_gc_data;
+
+    /** Shortcuts to the module */
+    unsigned    i_shortcuts;
+    char        **pp_shortcuts;
 
     /*
      * Variables set by the module to identify itself
@@ -106,12 +107,14 @@ struct module_t
     char *psz_longname;                   /**< Module descriptive name */
     char *psz_help;        /**< Long help string for "special" modules */
 
-    /** Shortcuts to the module */
-    char *pp_shortcuts[ MODULE_SHORTCUT_MAX ];
-
     char    *psz_capability;                                 /**< Capability */
     int      i_score;                          /**< Score for the capability */
 
+    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 */
     int  ( * pf_activate )   ( vlc_object_t * );
     void ( * pf_deactivate ) ( vlc_object_t * );
@@ -131,15 +134,6 @@ struct module_t
     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 */
-
-    /*
-     * Other variables set by the module to identify itself
-     */
-    bool b_unloadable;                        /**< Can we be dlclosed? */
-    bool b_submodule;                        /**< Is this a submodule? */
 };
 
 module_t *vlc_module_create (vlc_object_t *);