[MPlayer-cvslog] r31439 - in trunk: gui/interface.c gui/win32/dialogs.c libvo/sub.h libvo/vo_dxr3.c

[diego]

Author: diego
Date: Thu Jun 17 10:07:37 2010
New Revision: 31439

Log:
Place vo_osd_list extern declaration in sub.h instead of all over the code.

Modified:
   trunk/gui/interface.c
   trunk/gui/win32/dialogs.c
   trunk/libvo/sub.h
   trunk/libvo/vo_dxr3.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jun 17 10:04:12 2010	(r31438)
+++ trunk/gui/interface.c	Thu Jun 17 10:07:37 2010	(r31439)
@@ -400,8 +400,6 @@ void guiLoadFont( void )
 #endif
 }
 
-extern mp_osd_obj_t* vo_osd_list;
-
 extern char **sub_name;
 
 void guiLoadSubtitle( char * name )

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Thu Jun 17 10:04:12 2010	(r31438)
+++ trunk/gui/win32/dialogs.c	Thu Jun 17 10:07:37 2010	(r31439)
@@ -46,7 +46,6 @@ int get_video_colors(sh_video_t *sh_vide
 guiInterface_t guiIntfStruct;
 int addurl = 0;
 
-extern mp_osd_obj_t* vo_osd_list;
 extern char **sub_name;
 
 void guiLoadSubtitle(char *name)

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	Thu Jun 17 10:04:12 2010	(r31438)
+++ trunk/libvo/sub.h	Thu Jun 17 10:07:37 2010	(r31439)
@@ -82,6 +82,8 @@ extern int vo_osd_teletext_format;
 extern int vo_osd_progbar_type;
 extern int vo_osd_progbar_value;   // 0..255
 
+extern mp_osd_obj_t *vo_osd_list;
+
 extern void* vo_spudec;
 extern void* vo_vobsub;
 

Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c	Thu Jun 17 10:04:12 2010	(r31438)
+++ trunk/libvo/vo_dxr3.c	Thu Jun 17 10:07:37 2010	(r31439)
@@ -587,8 +587,6 @@ static void draw_alpha(int x, int y, int
 #endif
 }
 
-extern mp_osd_obj_t* vo_osd_list;
-
 static void draw_osd(void)
 {
 #ifdef SPU_SUPPORT