Commit da51bf44 authored by Ilkka Ollakka's avatar Ilkka Ollakka

add add_font define to plugin defines, and change freetype to use it

parent c6f40f60
...@@ -315,6 +315,10 @@ enum vlc_module_properties ...@@ -315,6 +315,10 @@ enum vlc_module_properties
add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \ add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \
p_callback, value ) p_callback, value )
#define add_font( name, value, p_callback, text, longtext, advc )\
add_string_inner( CONFIG_ITEM_FONT, name, text, longtext, advc, \
p_callback, value )
#define add_module( name, psz_caps, value, p_callback, text, longtext, advc ) \ #define add_module( name, psz_caps, value, p_callback, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_MODULE, name, text, longtext, advc, \ add_string_inner( CONFIG_ITEM_MODULE, name, text, longtext, advc, \
p_callback, value ) \ p_callback, value ) \
......
...@@ -142,7 +142,7 @@ vlc_module_begin () ...@@ -142,7 +142,7 @@ vlc_module_begin ()
set_category( CAT_VIDEO ) set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC ) set_subcategory( SUBCAT_VIDEO_SUBPIC )
add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT, add_font( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
false ) false )
add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT, add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
......
...@@ -47,7 +47,7 @@ int IsConfigStringType (int type) ...@@ -47,7 +47,7 @@ int IsConfigStringType (int type)
{ {
CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE, CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE,
CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD, CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD,
CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT, CONFIG_ITEM_FONT
}; };
/* NOTE: this needs to be changed if we ever get more than 255 types */ /* NOTE: this needs to be changed if we ever get more than 255 types */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment