Re: [MPlayer-dev-eng] [PATCH] Move declarations of vo_font, sub_font to correct header file

["Bryan Henderson" <giraffedata@xxxxxxxxx>]

>The global variables vo_font and sub_font are defined in libvo/sub.c,
>but declared in libvo/font_load.h.  They aren't even used by the font
>loader code.
>
>This patch moves the declarations to libvo/sub.h.

So is any one interested in committing this?  Makes the code easier to
maintain and costs nothing.

Index: libvo/sub.h
===================================================================
--- libvo/sub.h	(revision 27074)
+++ libvo/sub.h	(working copy)
@@ -50,6 +75,9 @@
 } mp_osd_obj_t;
 
 
+extern struct font_desc* vo_font;
+extern struct font_desc* sub_font;
+
 #if 0
 
 // disable subtitles:
Index: libvo/font_load.h
===================================================================
--- libvo/font_load.h	(revision 27074)
+++ libvo/font_load.h	(working copy)
@@ -61,9 +62,6 @@
 
 } font_desc_t;
 
-extern font_desc_t* vo_font;
-extern font_desc_t* sub_font;
-
 #ifdef HAVE_FREETYPE
 
 extern char *subtitle_font_encoding;
Index: libmenu/menu_list.c
===================================================================
--- libmenu/menu_list.c	(revision 27074)
+++ libmenu/menu_list.c	(working copy)
@@ -13,6 +13,7 @@
 #include "menu.h"
 
 #include "libvo/font_load.h"
+#include "libvo/sub.h"
 #include "osdep/keycodes.h"
 
 #define IMPL 1
Index: libmenu/menu_txt.c
===================================================================
--- libmenu/menu_txt.c	(revision 27074)
+++ libmenu/menu_txt.c	(working copy)
@@ -15,6 +15,7 @@
 #include "menu.h"
 
 #include "libvo/font_load.h"
+#include "libvo/sub.h"
 #include "osdep/keycodes.h"
 
 struct menu_priv_s {

_______________________________________________
MPlayer-dev-eng mailing list
MPlayer-dev-eng@xxxxxxxxxxxx
https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng