[vlc-devel] commit: add add_font define to plugin defines, and change freetype to use it (Ilkka Ollakka )

[git version control]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon Aug  3 11:33:48 2009 +0300| [da51bf440d1e1c33da5b379833af8d14223838ce] | committer: Ilkka Ollakka 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=da51bf440d1e1c33da5b379833af8d14223838ce
---

 include/vlc_plugin.h    |    4 ++++
 modules/misc/freetype.c |    2 +-
 src/config/core.c       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index c95acfe..897315b 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -315,6 +315,10 @@ enum vlc_module_properties
     add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \
                       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 ) \
     add_string_inner( CONFIG_ITEM_MODULE, name, text, longtext, advc, \
                       p_callback, value ) \
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index d0f4011..8f06444 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -142,7 +142,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     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 )
 
     add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
diff --git a/src/config/core.c b/src/config/core.c
index 721c2b5..8652d4e 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -47,7 +47,7 @@ int IsConfigStringType (int type)
     {
         CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE,
         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 */