X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_plugin.h;h=2788e4a2b3645f028f1fe7ed53966fdae6a62466;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=897315b4fe18056c604d9c347cacad5ccd7b36eb;hpb=da51bf440d1e1c33da5b379833af8d14223838ce;p=vlc diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 897315b4fe..2788e4a2b3 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -52,6 +52,7 @@ enum vlc_module_properties VLC_MODULE_SHORTNAME, VLC_MODULE_DESCRIPTION, VLC_MODULE_HELP, + VLC_MODULE_TEXTDOMAIN, /* Insert new VLC_MODULE_* here */ /* DO NOT EVER REMOVE, INSERT OR REPLACE ANY ITEM! It would break the ABI! @@ -119,8 +120,8 @@ enum vlc_module_properties /** * Current plugin ABI version */ -# define MODULE_SYMBOL 1_0_0e -# define MODULE_SUFFIX "__1_0_0e" +# define MODULE_SYMBOL 1_2_0d +# define MODULE_SUFFIX "__1_2_0d" /***************************************************************************** * Add a few defines. You do not want to read this section. Really. @@ -174,7 +175,6 @@ enum vlc_module_properties __VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \ { \ module_config_t *p_config = NULL; \ - const char *domain = NULL; \ if (vlc_module_set (p_module, VLC_MODULE_NAME, \ (const char *)(MODULE_STRING))) \ goto error; \ @@ -195,28 +195,26 @@ enum vlc_module_properties 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, \ - (int)(CPU_CAPABILITY_##cap))) \ - goto error; - -#define add_shortcut( shortcut ) \ +#define add_shortcut( ... ) \ +{ \ + const char *shortcuts[] = { __VA_ARGS__ }; \ if (vlc_module_set (p_submodule, VLC_MODULE_SHORTCUT, \ - (const char *)(shortcut))) \ - goto error; + sizeof(shortcuts)/sizeof(shortcuts[0]), shortcuts)) \ + goto error; \ +} #define set_shortname( shortname ) \ - if (vlc_module_set (p_submodule, VLC_MODULE_SHORTNAME, domain, \ + if (vlc_module_set (p_submodule, VLC_MODULE_SHORTNAME, \ (const char *)(shortname))) \ goto error; #define set_description( desc ) \ - if (vlc_module_set (p_submodule, VLC_MODULE_DESCRIPTION, domain, \ + if (vlc_module_set (p_submodule, VLC_MODULE_DESCRIPTION, \ (const char *)(desc))) \ goto error; #define set_help( help ) \ - if (vlc_module_set (p_submodule, VLC_MODULE_HELP, domain, \ + if (vlc_module_set (p_submodule, VLC_MODULE_HELP, \ (const char *)(help))) \ goto error; @@ -231,11 +229,13 @@ enum vlc_module_properties || vlc_module_set (p_submodule, VLC_MODULE_CB_CLOSE, deactivate)) \ goto error; -#define linked_with_a_crap_library_which_uses_atexit( ) \ +#define cannot_unload_broken_library( ) \ if (vlc_module_set (p_submodule, VLC_MODULE_NO_UNLOAD)) \ goto error; -#define set_text_domain( dom ) domain = (dom); +#define set_text_domain( dom ) \ + if (vlc_module_set (p_module, VLC_MODULE_TEXTDOMAIN, (dom))) \ + goto error; /***************************************************************************** * Macros used to build the configuration structure. @@ -255,7 +255,7 @@ enum vlc_module_properties #define add_typedesc_inner( type, text, longtext ) \ add_type_inner( type ) \ - vlc_config_set (p_config, VLC_CONFIG_DESC, domain, \ + vlc_config_set (p_config, VLC_CONFIG_DESC, \ (const char *)(text), (const char *)(longtext)); #define add_typeadv_inner( type, text, longtext, advc ) \ @@ -273,16 +273,16 @@ enum vlc_module_properties #define add_int_inner( type, name, text, longtext, advc, cb, v ) \ add_typename_inner( type, name, text, longtext, advc, cb ) \ - vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)(v)); + vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(v)); #define set_category( i_id ) \ add_type_inner( CONFIG_CATEGORY ) \ - vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)(i_id)); + vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(i_id)); #define set_subcategory( i_id ) \ add_type_inner( CONFIG_SUBCATEGORY ) \ - vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)(i_id)); + vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(i_id)); #define set_section( text, longtext ) \ add_typedesc_inner( CONFIG_SECTION, text, longtext ) @@ -345,17 +345,11 @@ enum vlc_module_properties 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 ) \ @@ -372,7 +366,7 @@ enum vlc_module_properties #define add_bool( name, v, p_callback, text, longtext, advc ) \ add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, \ p_callback ) \ - if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)true); + if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)true); /* For removed option */ #define add_obsolete_inner( name, type ) \ @@ -402,40 +396,44 @@ enum vlc_module_properties vlc_config_set (p_config, VLC_CONFIG_SHORTCUT, (int)(ch)); #define change_string_list( list, list_text, list_update_func ) \ - vlc_config_set (p_config, VLC_CONFIG_LIST, domain, \ + vlc_config_set (p_config, VLC_CONFIG_LIST, \ (size_t)(sizeof (list) / sizeof (char *)), \ (const char *const *)(list), \ (const char *const *)(list_text), \ (vlc_callback_t)(list_update_func)); #define change_integer_list( list, list_text, list_update_func ) \ - vlc_config_set (p_config, VLC_CONFIG_LIST, domain, \ + 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)); #define change_integer_range( minv, maxv ) \ - vlc_config_set (p_config, VLC_CONFIG_RANGE, (int)(minv), (int)(maxv)); + vlc_config_set (p_config, VLC_CONFIG_RANGE, \ + (int64_t)(minv), (int64_t)(maxv)); #define change_float_range( minv, maxv ) \ vlc_config_set (p_config, VLC_CONFIG_RANGE, \ (double)(minv), (double)(maxv)); #define change_action_add( pf_action, text ) \ - vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, domain, \ + vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \ (vlc_callback_t)(pf_action), (const char *)(text)); -#define change_internal() \ - vlc_config_set (p_config, VLC_CONFIG_PRIVATE); - #define change_need_restart() \ vlc_config_set (p_config, VLC_CONFIG_RESTART); #define change_autosave() \ vlc_config_set (p_config, VLC_CONFIG_PERSISTENT); -#define change_unsaveable() \ +/* For options that are saved but hidden from the preferences panel */ +#define change_private() \ + vlc_config_set (p_config, VLC_CONFIG_PRIVATE); + +/* For options that cannot be saved in the configuration */ +#define change_volatile() \ + change_private() \ vlc_config_set (p_config, VLC_CONFIG_VOLATILE); #define change_safe() \