X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fmodules.h;h=a566019ffdbf698c3ef7469c670e7d1598c15b7c;hb=4f2f1d8e85a302fb1a7af5623de489c5c8f8a9c9;hp=92acaf42f464e7d24a656f1351382b2437649f08;hpb=61817460a63d12c6769c7cc25b04a5c092a64e97;p=vlc diff --git a/src/modules/modules.h b/src/modules/modules.h index 92acaf42f4..a566019ffd 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 * @@ -25,8 +25,8 @@ # error This header file can only be included from LibVLC. #endif -#ifndef __LIBVLC_MODULES_H -# define __LIBVLC_MODULES_H 1 +#ifndef LIBVLC_MODULES_H +# define LIBVLC_MODULES_H 1 /* Number of tries before we unload an unused module */ @@ -39,24 +39,19 @@ *****************************************************************************/ struct module_bank_t { - VLC_COMMON_MEMBERS - - int i_usage; - - vlc_bool_t b_main; - vlc_bool_t b_builtins; - vlc_bool_t b_plugins; + unsigned i_usage; /* 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; int i_cache; module_cache_t **pp_cache; int i_loaded_cache; module_cache_t **pp_loaded_cache; + + module_t *head; }; /***************************************************************************** @@ -68,18 +63,16 @@ struct module_cache_t char *psz_file; int64_t i_time; int64_t i_size; - vlc_bool_t b_junk; /* Optional extra data */ module_t *p_module; - vlc_bool_t b_used; }; -#define MODULE_SHORTCUT_MAX 50 +#define MODULE_SHORTCUT_MAX 20 /* 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 # endif @@ -99,25 +92,32 @@ typedef shl_t module_handle_t; */ struct module_t { - VLC_COMMON_MEMBERS + char *psz_object_name; + gc_object_t vlc_gc_data; + + module_t *next; + module_t *parent; + module_t *submodule; + unsigned submodule_count; + + /** Shortcuts to the module */ + unsigned i_shortcuts; + char **pp_shortcuts; /* * 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 */ - - /** Shortcuts to the module */ - const char *pp_shortcuts[ MODULE_SHORTCUT_MAX ]; + char *psz_shortname; /**< Module name */ + char *psz_longname; /**< Module descriptive name */ + char *psz_help; /**< Long help string for "special" modules */ 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_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 * ); @@ -137,32 +137,31 @@ struct module_t /* Plugin-specific stuff */ 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 */ + char * domain; /* gettext domain */ }; +module_t *vlc_module_create (vlc_object_t *); +module_t *vlc_submodule_create (module_t *module); + +void module_InitBank( vlc_object_t * ); +#define module_InitBank(a) module_InitBank(VLC_OBJECT(a)) +void module_LoadPlugins( vlc_object_t * ); +#define module_LoadPlugins(a) module_LoadPlugins(VLC_OBJECT(a)) +void module_EndBank( vlc_object_t *, bool ); +#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b) -#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 * ); +int vlc_bindtextdomain (const char *); -/* Low-level OS-dependant handler */ -int module_Call (module_t *); +/* 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 (vlc_object_t *, const char *, int64_t, int64_t); +void CacheDelete(vlc_object_t *, const char *); +void CacheLoad (vlc_object_t *, module_bank_t *, const char *); +void CacheSave (vlc_object_t *, const char *, module_cache_t *const *, size_t); +module_cache_t * CacheFind (module_bank_t *, const char *, int64_t, int64_t); -#endif /* !__LIBVLC_MODULES_H */ +#endif /* !LIBVLC_MODULES_H */