typo

[vlc] / include / modules.h

diff --git a/include/modules.h b/include/modules.h
index 6de57cff530f955cb14e60d0091edabc273bc1db..41def36da309b82e6423529326ed5d8b60ceb64e 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * modules.h : Module management functions.
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: modules.h,v 1.59 2002/07/31 20:56:50 sam Exp $
+ * Copyright (C) 2001 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -27,13 +27,22 @@
 
 /* Number of tries before we unload an unused module */
 #define MODULE_HIDE_DELAY 50
-#define MODULE_SHORTCUT_MAX 10
+#define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
-#ifdef SYS_BEOS
-typedef int     module_handle_t;
-#else
-typedef void *  module_handle_t;
+#if defined(HAVE_DL_DYLD)
+#   if defined (HAVE_MACH_O_DYLD_H)
+#       include <mach-o/dyld.h>
+#   endif
+typedef NSModule module_handle_t;
+#elif defined(HAVE_IMAGE_H)
+typedef int module_handle_t;
+#elif defined(WIN32) || defined(UNDER_CE)
+typedef void * module_handle_t;
+#elif defined(HAVE_DL_DLOPEN)
+typedef void * module_handle_t;
+#elif defined(HAVE_DL_SHL_LOAD)
+typedef shl_t module_handle_t;
 #endif
 
 /*****************************************************************************
@@ -45,12 +54,25 @@ struct module_bank_t
 {
     VLC_COMMON_MEMBERS
 
-    module_t *   first;                          /* First module in the bank */
-    int          i_count;                     /* Number of allocated modules */
-
-    vlc_mutex_t  lock;         /* Global lock -- you can't imagine how awful *
-                                    it is to design thread-safe linked lists */
+    int              i_usage;
+#ifndef HAVE_SHARED_LIBVLC
     module_symbols_t symbols;
+#endif
+
+    vlc_bool_t       b_main;
+    vlc_bool_t       b_builtins;
+    vlc_bool_t       b_plugins;
+
+    /* Plugins cache */
+    vlc_bool_t     b_cache;
+    vlc_bool_t     b_cache_dirty;
+    vlc_bool_t     b_cache_delete;
+
+    int            i_cache;
+    module_cache_t **pp_cache;
+
+    int            i_loaded_cache;
+    module_cache_t **pp_loaded_cache;
 };
 
 /*****************************************************************************
@@ -63,7 +85,9 @@ struct module_t
     /*
      * Variables set by the module to identify itself
      */
+    char *psz_shortname;                                      /* Module name */
     char *psz_longname;                           /* Module descriptive name */
+    char *psz_help;                /* Long help string for "special" modules */
 
     /*
      * Variables set by the module to tell us what it can do
@@ -72,10 +96,12 @@ struct module_t
 
     char *pp_shortcuts[ MODULE_SHORTCUT_MAX ];    /* Shortcuts to the module */
 
-    char *psz_capability;                                      /* Capability */
-    int   i_score;                              /* Score for each capability */
-    u32   i_cpu;                                /* Required CPU capabilities */
+    char    *psz_capability;                                   /* Capability */
+    int      i_score;                           /* Score for each 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? */
 
     /* Callbacks */
@@ -97,12 +123,7 @@ struct module_t
     char *              psz_filename;                     /* Module filename */
 
     vlc_bool_t          b_builtin;  /* Set to true if the module is built in */
-
-    int   i_usage;                                      /* Reference counter */
-    int   i_unused_delay;                  /* Delay until module is unloaded */
-
-    module_t *next;                                           /* Next module */
-    module_t *prev;                                       /* Previous module */
+    vlc_bool_t          b_loaded;        /* Set to true if the dll is loaded */
 
     /*
      * Symbol table we send to the module so that it can access vlc symbols
@@ -110,6 +131,21 @@ struct module_t
     module_symbols_t *p_symbols;
 };
 
+/*****************************************************************************
+ * Module cache description structure
+ *****************************************************************************/
+struct module_cache_t
+{
+    /* Mandatory cache entry header */
+    char       *psz_file;
+    int64_t    i_time;
+    int64_t    i_size;
+    vlc_bool_t b_junk;
+
+    /* Optional extra data */
+    module_t *p_module;
+};
+
 /*****************************************************************************
  * Exported functions.
  *****************************************************************************/
@@ -125,11 +161,9 @@ void  __module_LoadPlugins     ( vlc_object_t * );
 void  __module_EndBank         ( vlc_object_t * );
 #define module_ResetBank(a)    __module_ResetBank(VLC_OBJECT(a))
 void  __module_ResetBank       ( vlc_object_t * );
-#define module_ManageBank(a)   __module_ManageBank(VLC_OBJECT(a))
-void  __module_ManageBank      ( vlc_object_t * );
 
-#define module_Need(a,b,c) __module_Need(VLC_OBJECT(a),b,c)
-VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, const char *, const char * ) );
+#define module_Need(a,b,c,d) __module_Need(VLC_OBJECT(a),b,c,d)
+VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, const char *, const char *, vlc_bool_t ) );
 #define module_Unneed(a,b) __module_Unneed(VLC_OBJECT(a),b)
 VLC_EXPORT( void, __module_Unneed, ( vlc_object_t *, module_t * ) );