X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_plugin.h;h=8e5f9003ddf89038e9490d0a396dbe3698bddd83;hb=d3c449f26a72761b20dc8cb8334fdd5622acd1f2;hp=0cb3ea9fe82ee033c35e5e79644c4178009d9111;hpb=25a1b84bd5591bb4574191ed5ad7a96365603d2a;p=vlc diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 0cb3ea9fe8..8e5f9003dd 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -2,7 +2,7 @@ * vlc_plugin.h : Macros used from within a module. ***************************************************************************** * Copyright (C) 2001-2006 the VideoLAN team - * Copyright © 2007-2008 Rémi Denis-Courmont + * Copyright © 2007-2009 Rémi Denis-Courmont * * Authors: Samuel Hocevar * @@ -29,24 +29,22 @@ * This file implements plugin (module) macros used to define a vlc module. */ -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, ...) ); -VLC_EXPORT( module_config_t *, vlc_config_create, (module_t *, int type) ); -VLC_EXPORT( int, vlc_config_set, (module_config_t *, int, ...) ); +VLC_EXPORT( int, vlc_plugin_set, (module_t *, module_config_t *, int, ...) ); + +#define vlc_module_set( mod, ... ) vlc_plugin_set ((mod), NULL, __VA_ARGS__) +#define vlc_config_set( cfg, ... ) vlc_plugin_set (NULL, (cfg), __VA_ARGS__) enum vlc_module_properties { + VLC_SUBMODULE_CREATE, + VLC_CONFIG_CREATE, + /* 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_CPU_REQUIREMENT=0x100, VLC_MODULE_SHORTCUT, - VLC_MODULE_SHORTNAME_NODOMAIN, - VLC_MODULE_DESCRIPTION_NODOMAIN, - VLC_MODULE_HELP_NODOMAIN, VLC_MODULE_CAPABILITY, VLC_MODULE_SCORE, - VLC_MODULE_PROGRAM, /* obsoleted */ VLC_MODULE_CB_OPEN, VLC_MODULE_CB_CLOSE, VLC_MODULE_NO_UNLOAD, @@ -54,19 +52,13 @@ enum vlc_module_properties VLC_MODULE_SHORTNAME, VLC_MODULE_DESCRIPTION, VLC_MODULE_HELP, -}; + /* Insert new VLC_MODULE_* here */ -enum vlc_config_properties -{ /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI! * Append new items at the end ONLY. */ - - VLC_CONFIG_NAME, + VLC_CONFIG_NAME=0x1000, /* command line name (args=const char *, vlc_callback_t) */ - VLC_CONFIG_DESC_NODOMAIN, - /* description (args=const char *, const char *) */ - VLC_CONFIG_VALUE, /* actual value (args=int/double/const char *) */ @@ -97,13 +89,6 @@ enum vlc_config_properties VLC_CONFIG_SHORTCUT, /* one-character (short) command line option name (args=char) */ - VLC_CONFIG_LIST_NODOMAIN, - /* possible values list - * (args=size_t, const *, const char *const *) */ - - VLC_CONFIG_ADD_ACTION_NODOMAIN, - /* add value change callback (args=vlc_callback_t, const char *) */ - VLC_CONFIG_OLDNAME, /* former option name (args=const char *) */ @@ -120,6 +105,8 @@ enum vlc_config_properties VLC_CONFIG_ADD_ACTION, /* add value change callback * (args=const char *, vlc_callback_t, const char *) */ + + /* Insert new VLC_CONFIG_* here */ }; /***************************************************************************** @@ -132,8 +119,8 @@ enum vlc_config_properties /** * Current plugin ABI version */ -# define MODULE_SYMBOL 1_0_0c -# define MODULE_SUFFIX "__1_0_0c" +# define MODULE_SYMBOL 1_0_0e +# define MODULE_SUFFIX "__1_0_0e" /***************************************************************************** * Add a few defines. You do not want to read this section. Really. @@ -205,7 +192,8 @@ enum vlc_config_properties VLC_METADATA_EXPORTS #define add_submodule( ) \ - p_submodule = vlc_submodule_create( p_module ); + if (vlc_plugin_set (p_module, NULL, VLC_SUBMODULE_CREATE, &p_submodule)) \ + goto error; #define add_requirement( cap ) \ if (vlc_module_set (p_module, VLC_MODULE_CPU_REQUIREMENT, \ @@ -263,7 +251,7 @@ enum vlc_config_properties *****************************************************************************/ #define add_type_inner( type ) \ - p_config = vlc_config_create (p_module, type); + vlc_plugin_set (p_module, NULL, VLC_CONFIG_CREATE, (type), &p_config); #define add_typedesc_inner( type, text, longtext ) \ add_type_inner( type ) \ @@ -341,21 +329,29 @@ enum vlc_config_properties #define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \ add_string_inner( CONFIG_ITEM_MODULE_CAT, name, text, longtext, advc, \ p_callback, value ) \ - p_config->min.i = i_subcategory /* gruik */; + change_integer_range (i_subcategory /* gruik */, 0); #define add_module_list_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \ add_string_inner( CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, \ advc, p_callback, value ) \ - p_config->min.i = i_subcategory /* gruik */; + change_integer_range (i_subcategory /* gruik */, 0); #endif #define add_integer( name, value, p_callback, text, longtext, advc ) \ add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, \ p_callback, value ) +#if !defined(WIN32) && !defined(SYS_LINUX) #define add_key( name, value, p_callback, text, longtext, advc ) \ add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, p_callback, \ value ) +#else +#define add_key( name, value, p_callback, text, longtext, advc ) \ + add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, \ + p_callback, value ) \ + add_int_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \ + p_callback, KEY_UNSET ) +#endif #define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \ add_integer( name, value, p_callback, text, longtext, advc ) \ @@ -396,7 +392,7 @@ enum vlc_config_properties /* Modifier macros for the config options (used for fine tuning) */ #define add_deprecated_alias( name ) \ - vlc_config_set (p_config, VLC_CONFIG_OLDNAME, (const char *)(name)) + vlc_config_set (p_config, VLC_CONFIG_OLDNAME, (const char *)(name)); #define change_short( ch ) \ vlc_config_set (p_config, VLC_CONFIG_SHORTCUT, (int)(ch)); @@ -415,13 +411,6 @@ enum vlc_config_properties (const char *const *)(list_text), \ (vlc_callback_t)(list_update_func)); -#define change_float_list( list, list_text, list_update_func ) \ - vlc_config_set (p_config, VLC_CONFIG_LIST, domain, \ - (size_t)(sizeof (list) / sizeof (float)), \ - (const float *)(list), \ - (const char *const *)(list_text), \ - (vlc_callback_t)(list_update_func)); - #define change_integer_range( minv, maxv ) \ vlc_config_set (p_config, VLC_CONFIG_RANGE, (int)(minv), (int)(maxv));