*****************************************************************************/
struct module_bank_t
{
- VLC_COMMON_MEMBERS
+ unsigned i_usage;
- int i_usage;
-
- bool b_builtins;
- bool b_plugins;
+ bool b_plugins;
/* Plugins cache */
- bool b_cache;
- bool b_cache_dirty;
- bool b_cache_delete;
+ bool b_cache;
+ bool b_cache_dirty;
int i_cache;
module_cache_t **pp_cache;
int i_loaded_cache;
module_cache_t **pp_loaded_cache;
+
+ module_t *head;
};
/*****************************************************************************
bool b_junk;
/* Optional extra data */
- module_t *p_module;
bool b_used;
+ module_t *p_module;
};
#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
*/
struct module_t
{
- VLC_COMMON_MEMBERS
+ char *psz_object_name;
+ module_t *next;
+ module_t *submodule;
+ module_t *parent;
+ unsigned submodule_count;
+ gc_object_t vlc_gc_data;
+ vlc_mutex_t lock;
/*
* Variables set by the module to identify itself
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 */
bool b_loaded; /* Set to true if the dll is loaded */
};
+module_t *vlc_module_create (vlc_object_t *);
+module_t *vlc_submodule_create (module_t *module);
#define module_InitBank(a) __module_InitBank(VLC_OBJECT(a))
void __module_InitBank ( vlc_object_t * );
-#define module_LoadBuiltins(a) __module_LoadBuiltins(VLC_OBJECT(a))
-void __module_LoadBuiltins ( vlc_object_t * );
-#define module_LoadPlugins(a) __module_LoadPlugins(VLC_OBJECT(a))
-void __module_LoadPlugins ( vlc_object_t * );
-#define module_EndBank(a) __module_EndBank(VLC_OBJECT(a))
-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 */
-int module_Call (module_t *);
+void module_LoadPlugins( vlc_object_t *, bool );
+#define module_LoadPlugins(a,b) module_LoadPlugins(VLC_OBJECT(a),b)
+void module_EndBank( vlc_object_t *, bool );
+#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b)
+
+/* Low-level OS-dependent handler */
int module_Load (vlc_object_t *, const char *, module_handle_t *);
+int module_Call (vlc_object_t *obj, module_t *);
void module_Unload (module_handle_t);
/* Plugins cache */
void CacheMerge (vlc_object_t *, module_t *, module_t *);
-void CacheLoad (vlc_object_t * );
-void CacheSave (vlc_object_t * );
-module_cache_t * CacheFind (const char *, int64_t, int64_t);
+void CacheLoad (vlc_object_t *, module_bank_t *, bool);
+void CacheSave (vlc_object_t *, module_bank_t *);
+module_cache_t * CacheFind (module_bank_t *, const char *, int64_t, int64_t);
#endif /* !__LIBVLC_MODULES_H */