Changeset d2a0694d908f98db8b8dadbaaa2db07253344f16

Timestamp:

05/08/08 18:20:19 (2 months ago)

Author:

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

git-committer:

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

git-parent:

[c3b55fa92cbc1a37e1880a773ec264aecec52486]

git-author:

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

Message:

vlc_module_set: use vararg, more flexible

Files:

• include/vlc_common.h (modified) (2 diffs)
• include/vlc_modules.h (modified) (1 diff)
• include/vlc_modules_macros.h (modified) (6 diffs)
• src/modules/entry.c (modified) (4 diffs)

include/vlc_common.h

@@ -391 +391 @@
- * Plug-in stuff
- *****************************************************************************/
-
-#include "vlc_modules_macros.h"
-
-#if defined (WIN32) && defined (DLL_EXPORT)
@@ -432 +430 @@
-#  endif
-#endif
+
+#include "vlc_modules_macros.h"
-
-/*****************************************************************************

include/vlc_modules.h

@@ -53 +53 @@
-                      char ***psz_longname ) );
-
-VLC_EXPORT( module_t *, vlc_module_create, ( vlc_object_t * ) );
-VLC_EXPORT( module_t *, vlc_submodule_create, ( module_t * ) );
-VLC_EXPORT( int, vlc_module_set, (module_t *module, int propid, void *value) );
-
-enum vlc_module_properties
-{
-    /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI!
-     * Append new items at the end ONLY. */
-    VLC_MODULE_CPU_REQUIREMENT,
-    VLC_MODULE_SHORTCUT,
-    VLC_MODULE_SHORTNAME,
-    VLC_MODULE_DESCRIPTION,
-    VLC_MODULE_HELP,
-    VLC_MODULE_CAPABILITY,
-    VLC_MODULE_SCORE,
-    VLC_MODULE_PROGRAM,
-    VLC_MODULE_CB_OPEN,
-    VLC_MODULE_CB_CLOSE,
-    VLC_MODULE_UNLOADABLE,
-    VLC_MODULE_NAME,
-};
-
-VLC_EXPORT( bool, module_IsCapable, ( const module_t *m, const char *cap ) );
-VLC_EXPORT( const char *, module_GetObjName, ( const module_t *m ) );

include/vlc_modules_macros.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
-$Id$
+Copyright © 2007-2008 Rémi Denis-Courmont
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -22 +22 @@
- *****************************************************************************/
-
-
-
-
+
+
-
-/*****************************************************************************
@@ -63 +62 @@
-/* If the module is built-in, then we need to define foo_InitModule instead
- * of InitModule. Same for Activate- and DeactivateModule. */
- defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
+def __PLUGIN__
-#   define E_( function )          CONCATENATE( function, MODULE_SYMBOL )
-#   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL )
@@ -113 +112 @@
-        module_config_t *p_config = NULL;                                     \
-        if (vlc_module_set (p_module, VLC_MODULE_NAME,                        \
-void *)(MODULE_STRING)))      
+const char *)(MODULE_STRING)))
-            goto error;                                                       \
-        {                                                                     \
@@ -124 +123 @@
-                                                                              \
-    error:                                                                    \
-        /* FIXME: config_Free( p_module ); */                                 \
-        /* FIXME: cleanup submodules objects ??? */                           \
-        return VLC_EGENERIC;                                                  \
-    }                                                                         \
@@ -136 +133 @@
-#define add_requirement( cap ) \
-    if (vlc_module_set (p_module, VLC_MODULE_CPU_REQUIREMENT, \
-
+
+
-
-#define add_shortcut( shortcut ) \
-void*
+int
-        goto error
-
-#define set_shortname( shortname ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_SHORTNAME, \
-
+
+
-
-#define set_description( desc ) \
-
+
+
-        goto error
-
-#define set_help( help ) \
-void
+const char 
-        goto error
-
-#define set_capability( cap, score ) \
-
-
-
+
+
-        goto error
-
-#define set_callbacks( activate, deactivate ) \
-
-
-
+
+
-        goto error
-
-#define linked_with_a_crap_library_which_uses_atexit( ) \
-
+
+
-
+VLC_EXPORT( module_t *, vlc_module_create, ( vlc_object_t * ) );
+VLC_EXPORT( module_t *, vlc_submodule_create, ( module_t * ) );
+VLC_EXPORT( int, vlc_module_set, (module_t *module, int propid, ...) );
+
+enum vlc_module_properties
+{
+    /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI!
+     * Append new items at the end ONLY. */
+    VLC_MODULE_CPU_REQUIREMENT,
+    VLC_MODULE_SHORTCUT,
+    VLC_MODULE_SHORTNAME,
+    VLC_MODULE_DESCRIPTION,
+    VLC_MODULE_HELP,
+    VLC_MODULE_CAPABILITY,
+    VLC_MODULE_SCORE,
+    VLC_MODULE_PROGRAM,
+    VLC_MODULE_CB_OPEN,
+    VLC_MODULE_CB_CLOSE,
+    VLC_MODULE_NO_UNLOAD,
+    VLC_MODULE_NAME,
+};
+#endif

src/modules/entry.c

@@ -2 +2 @@
- * entry.c : Callbacks for module entry point
- *****************************************************************************
-
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -80 +81 @@
-
-
-void *value
+...
-{
+    va_list ap;
+    int ret = VLC_SUCCESS;
+
+    va_start (ap, propid);
-    switch (propid)
-    {
-        case VLC_MODULE_CPU_REQUIREMENT:
-            assert (!module->b_submodule);
-(intptr_t)value
+va_arg (ap, int)
-            break;
-
@@ -94 +99 @@
-            for (i = 0; module->pp_shortcuts[i] != NULL; i++);
-            if (i >= (MODULE_SHORTCUT_MAX - 1))
-
-
-
+
+
+
+
+
+
-            break;
-        }
-
-        case VLC_MODULE_SHORTNAME:
-(char *)value
+va_arg (ap, char *)
-            break;
-
-        case VLC_MODULE_DESCRIPTION:
-(char *)value
+va_arg (ap, char *)
-            break;
-
-        case VLC_MODULE_HELP:
-(char *)value
+va_arg (ap, char *)
-            break;
-
-        case VLC_MODULE_CAPABILITY:
-(char *)value
+va_arg (ap, char *)
-            break;
-
-        case VLC_MODULE_SCORE:
-(intptr_t)value
+va_arg (ap, int)
-            break;
-
-        case VLC_MODULE_CB_OPEN:
-(int (*) (vlc_object_t *))value
+va_arg (ap, int (*) (vlc_object_t *))
-            break;
-
-        case VLC_MODULE_CB_CLOSE:
-(void (*) (vlc_object_t *))value
-
-
-UNLOADABLE
-(value != NULL)
+va_arg (ap, void (*) (vlc_object_t *))
+
+
+NO_UNLOAD
+false
-            break;
-
-        case VLC_MODULE_NAME:
+        {
+            const char *value = va_arg (ap, const char *);
-            free( module->psz_object_name );
-(char *)
-(char *)
+
+
-            if (module->psz_longname == default_name)
-
-
+
+
+
-
-        case VLC_MODULE_PROGRAM:
@@ -147 +158 @@
-            msg_Err (module, "unknown module property %d", propid);
-            msg_Err (module, "LibVLC might be too old to use this module.");
-
+
+
-    }
-
+
+
-}
-