Revert "Modules: use a dynamic array for the shortcuts (this save 40K of memory on...

[vlc] / src / modules / modules.h

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 2973c43aa4da35cae6a8ffbba77f4e15ca980acb..039cefa301f595e47fc01a2c1618d2306938180c 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -69,7 +69,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 +93,12 @@ 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;
 
     /*
      * Variables set by the module to identify itself
@@ -112,6 +113,8 @@ struct module_t
     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? */
 
@@ -134,9 +137,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 */
 };
 
 module_t *vlc_module_create (vlc_object_t *);