X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_modules.h;h=f3de9ea81b6d9f68908d250c5e19f4c21f6604f1;hb=62796e96ebc124277c473cab1028b2be2b8980c8;hp=70d0373398ebd5e7a0d8918d8d1369c3de6db99a;hpb=07c7cdcb2194cc5aa12b906f1489c9c4a76ef473;p=vlc

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 70d0373398..f3de9ea81b 100644
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -25,80 +25,6 @@
   #error You are not libvlc or one of its plugins. You cannot include this file
 #endif
 
-#define MODULE_SHORTCUT_MAX 50
-
-/* The module handle type. */
-#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
-
-/**
- * Module descriptor
- */
-#ifndef __PLUGIN__FIXME___
-/* FIXME: scheduled for privatization */
-struct module_t
-{
-    VLC_COMMON_MEMBERS
-
-    /*
-     * 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 */
-
-    /*
-     * Variables set by the module to tell us what it can do
-     */
-    const char *psz_program; /**< Program name which will activate the module */
-
-    /** Shortcuts to the module */
-    const char *pp_shortcuts[ MODULE_SHORTCUT_MAX ];
-
-    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? */
-
-    /* Callbacks */
-    int  ( * pf_activate )   ( vlc_object_t * );
-    void ( * pf_deactivate ) ( vlc_object_t * );
-
-    /*
-     * Variables set by the module to store its config options
-     */
-    module_config_t *p_config;             /* Module configuration structure */
-    size_t           confsize;            /* Number of module_config_t items */
-    unsigned int     i_config_items;        /* number of configuration items */
-    unsigned int     i_bool_items;            /* number of bool config items */
-
-    /*
-     * Variables used internally by the module manager
-     */
-    /* 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 */
-};
-#endif
-
 /*****************************************************************************
  * Exported functions.
  *****************************************************************************/
@@ -109,9 +35,13 @@ VLC_EXPORT( void, __module_Unneed, ( vlc_object_t *, module_t * ) );
 #define module_Exists(a,b) __module_Exists(VLC_OBJECT(a),b)
 VLC_EXPORT( vlc_bool_t,  __module_Exists, ( vlc_object_t *, const char * ) );
 
-/* Use only if you know what you're doing... */
-#define module_FindName(a,b) __module_FindName(VLC_OBJECT(a),b)
-VLC_EXPORT( module_t *, __module_FindName, ( vlc_object_t *, const char * ) );
+#define module_Find(a,b) __module_Find(VLC_OBJECT(a),b)
+VLC_EXPORT( module_t *, __module_Find, ( vlc_object_t *, const char * ) );
+VLC_EXPORT( void, module_Put, ( module_t *module ) );
+
+VLC_EXPORT( module_config_t *, module_GetConfig, ( const module_t *, unsigned * ) );
+VLC_EXPORT( void, module_PutConfig, ( module_config_t * ) );
+
 
 /* Return a NULL terminated array with the names of the modules that have a
  * certain capability.
@@ -141,7 +71,7 @@ enum vlc_module_properties
     VLC_MODULE_CB_OPEN,
     VLC_MODULE_CB_CLOSE,
     VLC_MODULE_UNLOADABLE,
-    VLC_MODULE_NAME
+    VLC_MODULE_NAME,
 };
 
 VLC_EXPORT( vlc_bool_t, module_IsCapable, ( const module_t *m, const char *cap ) );