vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Oct 22 20:48:41 2010 +0300| [981a8542bdcd1b3dd1aca96a35d16d4688e96e83] | committer: Rémi Denis-Courmont
add_font: remove unused parameter > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=981a8542bdcd1b3dd1aca96a35d16d4688e96e83 --- include/vlc_plugin.h | 2 +- modules/misc/freetype.c | 2 +- modules/visualization/projectm.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 0e01ffb..6192dcf 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -319,7 +319,7 @@ enum vlc_module_properties add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \ 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, \ value ) diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index 424c8ec..80a86a2 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -148,7 +148,7 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_SUBPIC ) - add_font( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT, + add_font( "freetype-font", DEFAULT_FONT, FONT_TEXT, FONT_LONGTEXT, false ) add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT, diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp index 6f30ec5..9c6b4dd 100644 --- a/modules/visualization/projectm.cpp +++ b/modules/visualization/projectm.cpp @@ -75,9 +75,9 @@ vlc_module_begin () #else add_loadfile( "projectm-preset-path", "/usr/share/projectM/presets", NULL, PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true ) - add_font( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", NULL, + add_font( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true ) - add_font( "projectm-menu-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", NULL, + add_font( "projectm-menu-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", MENU_FONT_TXT, MENU_FONT_LONGTXT, true ) #endif add_integer( "projectm-width", 800, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
