Changeset 264a446cdf82baafb2ee7514f9567b9a35852ac3

Timestamp:

14/04/07 21:00:42 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1176577242 +0000

git-parent:

[a1e8379fef3609a6ab791d1acc1d597962968ccf]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1176577242 +0000

Message:

Include modules.h whenever needed

Files:

• src/input/decoder.c (modified) (1 diff)
• src/interface/interface.c (modified) (1 diff)
• src/libvlc-common.c (modified) (1 diff)
• src/misc/objects.c (modified) (1 diff)
• src/modules/configuration.c (modified) (1 diff)
• src/modules/entry.c (modified) (2 diffs)
• src/modules/modules.h (modified) (1 diff)
• src/video_output/video_output.c (modified) (1 diff)

src/input/decoder.c

@@ -172 +172 @@
-                               i_priority, VLC_FALSE ) )
-        {
-
-
+
-            module_Unneed( p_dec, p_dec->p_module );
-            DeleteDecoder( p_dec );

src/interface/interface.c

@@ -43 +43 @@
-
-#include "vlc_interface.h"
+#include "modules/modules.h" // Gruik!
-
-#ifdef __APPLE__

src/libvlc-common.c

@@ -288 +288 @@
-
-    /* Hack: insert the help module here */
-object_create( p_libvlc, VLC_OBJECT_MODULE
+module_create( p_libvlc
-    if( p_help_module == NULL )
-    {

src/misc/objects.c

@@ -221 +221 @@
-            i_size = sizeof(libvlc_int_t);
-            psz_type = "libvlc";
-            break;
-        case VLC_OBJECT_MODULE:
-            i_size = sizeof(module_t);
-            psz_type = "module";
-            break;
-        case VLC_OBJECT_INTF:

src/modules/configuration.c

@@ -65 +65 @@
-
-#include "configuration.h"
+#include "modules/modules.h"
-
-static int ConfigStringToKey( const char * );

src/modules/entry.c

@@ -22 +22 @@
-#include <assert.h>
-
+#include "modules/modules.h"
+#include "libvlc.h"
+
-static const char default_name[] = "unnamed";
-
-module_t *vlc_module_create (vlc_object_t *obj)
-{
-
+
+
+
-    if (module == NULL)
-        return NULL;
@@ -49 +54 @@
-
-    module_t *submodule =
-
+
+
-    if (submodule == NULL)
-        return NULL;

src/modules/modules.h

@@ -71 +71 @@
-};
-
+
+#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
+
+/**
+ * Internal module descriptor
+ */
+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 ];
+
+    const 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 */
+
+#ifndef HAVE_SHARED_LIBVLC
+    /* Legacy symbols table */
+    module_symbols_t *p_symbols;
+#endif
+};
+
+
-#define module_InitBank(a)     __module_InitBank(VLC_OBJECT(a))
-void  __module_InitBank        ( vlc_object_t * );

src/video_output/video_output.c

@@ -54 +54 @@
-#include "input/input_internal.h"
-
+#include "modules/modules.h"
+
-/*****************************************************************************
- * Local prototypes