* This file implements plugin (module) macros used to define a vlc module.
*/
-VLC_EXPORT( int, vlc_plugin_set, (module_t *, module_config_t *, int, ...) );
+VLC_API 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__)
/* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI!
* Append new items at the end ONLY. */
VLC_CONFIG_NAME=0x1000,
- /* command line name (args=const char *, vlc_callback_t) */
+ /* command line name (args=const char *) */
VLC_CONFIG_VALUE,
/* actual value (args=int/double/const char *) */
VLC_CONFIG_VOLATILE,
/* don't write variable to storage (args=none) */
- VLC_CONFIG_PERSISTENT,
- /* always write variable to storage (args=none) */
-
- VLC_CONFIG_RESTART,
- /* restart required to apply value change (args=none) */
+ VLC_CONFIG_PERSISTENT_OBSOLETE,
+ /* unused (ignored) */
VLC_CONFIG_PRIVATE,
/* hide from user (args=none) */
/* Insert new VLC_CONFIG_* here */
};
-/*****************************************************************************
- * If we are not within a module, assume we're in the vlc core.
- *****************************************************************************/
-#if !defined( __PLUGIN__ ) && !defined( __BUILTIN__ )
-# define MODULE_NAME main
-#endif
-
/**
* Current plugin ABI version
*/
-# define MODULE_SYMBOL 1_2_0e
-# define MODULE_SUFFIX "__1_2_0e"
+# define MODULE_SYMBOL 1_2_0h
+# define MODULE_SUFFIX "__1_2_0h"
/*****************************************************************************
* Add a few defines. You do not want to read this section. Really.
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME )
#endif
-#if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
+#define CDECL_SYMBOL
+#if defined (__PLUGIN__)
+# if defined (WIN32)
# define DLL_SYMBOL __declspec(dllexport)
+# undef CDECL_SYMBOL
# define CDECL_SYMBOL __cdecl
+# elif defined (__GNUC__) && (__GNUC__ >= 4)
+# define DLL_SYMBOL __attribute__((visibility("default")))
+# else
+# define DLL_SYMBOL
+# endif
#else
-# define DLL_SYMBOL
-# define CDECL_SYMBOL
+# define DLL_SYMBOL
#endif
#if defined( __cplusplus )
add_typedesc_inner( type, text, longtext ) \
if (advc) vlc_config_set (p_config, VLC_CONFIG_ADVANCED);
-#define add_typename_inner( type, name, text, longtext, advc, cb ) \
+#define add_typename_inner( type, name, text, longtext, advc ) \
add_typeadv_inner( type, text, longtext, advc ) \
vlc_config_set (p_config, VLC_CONFIG_NAME, \
- (const char *)(name), (vlc_callback_t)(cb));
+ (const char *)(name));
-#define add_string_inner( type, name, text, longtext, advc, cb, v ) \
- add_typename_inner( type, name, text, longtext, advc, cb ) \
+#define add_string_inner( type, name, text, longtext, advc, v ) \
+ add_typename_inner( type, name, text, longtext, advc ) \
vlc_config_set (p_config, VLC_CONFIG_VALUE, (const char *)(v));
-#define add_int_inner( type, name, text, longtext, advc, cb, v ) \
- add_typename_inner( type, name, text, longtext, advc, cb ) \
+#define add_int_inner( type, name, text, longtext, advc, v ) \
+ add_typename_inner( type, name, text, longtext, advc ) \
vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(v));
#define add_usage_hint( text ) \
add_typedesc_inner( CONFIG_HINT_USAGE, text, NULL )
-#define add_string( name, value, p_callback, text, longtext, advc ) \
+#define add_string( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, \
- p_callback, value )
+ value )
-#define add_password( name, value, p_callback, text, longtext, advc ) \
+#define add_password( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_PASSWORD, name, text, longtext, advc, \
- p_callback, value )
+ value )
-#define add_loadfile( name, value, p_callback, text, longtext, advc ) \
+#define add_loadfile( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_LOADFILE, name, text, longtext, advc, \
- p_callback, value )
+ value )
-#define add_savefile( name, value, p_callback, text, longtext, advc ) \
+#define add_savefile( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_SAVEFILE, name, text, longtext, advc, \
- p_callback, value )
+ value )
-#define add_directory( name, value, p_callback, text, longtext, advc ) \
+#define add_directory( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \
- p_callback, value )
+ value )
-#define add_font( name, value, p_callback, text, longtext, advc )\
+#define add_font( name, value, text, longtext, advc )\
add_string_inner( CONFIG_ITEM_FONT, name, text, longtext, advc, \
- p_callback, value )
+ value )
-#define add_module( name, psz_caps, value, p_callback, text, longtext, advc ) \
+#define add_module( name, psz_caps, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_MODULE, name, text, longtext, advc, \
- p_callback, value ) \
+ value ) \
vlc_config_set (p_config, VLC_CONFIG_CAPABILITY, (const char *)(psz_caps));
-#define add_module_list( name, psz_caps, value, p_callback, text, longtext, advc ) \
+#define add_module_list( name, psz_caps, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_MODULE_LIST, name, text, longtext, advc, \
- p_callback, value ) \
+ value ) \
vlc_config_set (p_config, VLC_CONFIG_CAPABILITY, (const char *)(psz_caps));
#ifndef __PLUGIN__
-#define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
+#define add_module_cat( name, i_subcategory, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_MODULE_CAT, name, text, longtext, advc, \
- p_callback, value ) \
+ value ) \
change_integer_range (i_subcategory /* gruik */, 0);
-#define add_module_list_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
+#define add_module_list_cat( name, i_subcategory, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, \
- advc, p_callback, value ) \
+ advc, value ) \
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 )
+#define add_integer( name, value, text, longtext, advc ) \
+ add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, value )
-#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 )
+#define add_rgb( name, value, text, longtext, advc ) \
+ add_int_inner( CONFIG_ITEM_RGB, name, text, longtext, advc, value ) \
+ change_integer_range( 0, 0xFFFFFF )
-#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 ) \
+#define add_key( name, value, text, longtext, advc ) \
+ add_string_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
+ KEY_UNSET ) \
+ add_string_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, value )
+
+#define add_integer_with_range( name, value, i_min, i_max, text, longtext, advc ) \
+ add_integer( name, value, text, longtext, advc ) \
change_integer_range( i_min, i_max )
-#define add_float( name, v, p_callback, text, longtext, advc ) \
- add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc, p_callback ) \
+#define add_float( name, v, text, longtext, advc ) \
+ add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc ) \
vlc_config_set (p_config, VLC_CONFIG_VALUE, (double)(v));
-#define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
- add_float( name, value, p_callback, text, longtext, advc ) \
+#define add_float_with_range( name, value, f_min, f_max, text, longtext, advc ) \
+ add_float( name, value, text, longtext, advc ) \
change_float_range( f_min, f_max )
-#define add_bool( name, v, p_callback, text, longtext, advc ) \
- add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, \
- p_callback ) \
+#define add_bool( name, v, text, longtext, advc ) \
+ add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc ) \
if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)true);
/* For removed option */
#define add_obsolete_inner( name, type ) \
add_type_inner( type ) \
vlc_config_set (p_config, VLC_CONFIG_NAME, \
- (const char *)(name), (vlc_callback_t)NULL); \
+ (const char *)(name)); \
vlc_config_set (p_config, VLC_CONFIG_REMOVED);
#define add_obsolete_bool( name ) \
(const char *const *)(list_text), \
(vlc_callback_t)(list_update_func));
-#define change_integer_list( list, list_text, list_update_func ) \
+#define change_integer_list( list, list_text ) \
vlc_config_set (p_config, VLC_CONFIG_LIST, \
(size_t)(sizeof (list) / sizeof (int)), \
(const int *)(list), \
(const char *const *)(list_text), \
- (vlc_callback_t)(list_update_func));
+ (vlc_callback_t)(NULL));
#define change_integer_range( minv, maxv ) \
vlc_config_set (p_config, VLC_CONFIG_RANGE, \
vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \
(vlc_callback_t)(pf_action), (const char *)(text));
-#define change_need_restart() \
- vlc_config_set (p_config, VLC_CONFIG_RESTART);
-
-#define change_autosave() \
- vlc_config_set (p_config, VLC_CONFIG_PERSISTENT);
-
/* For options that are saved but hidden from the preferences panel */
#define change_private() \
vlc_config_set (p_config, VLC_CONFIG_PRIVATE);
projects / vlc / blobdiff