[MPlayer-cvslog] r21386 - in trunk: Gui/interface.h Gui/mplayer/gtk/fs.c Gui/mplayer/gtk/opts.c libvo/sub.h mencoder.c mplayer.h

[reimar]

Author: reimar
Date: Wed Nov 29 15:08:24 2006
New Revision: 21386

Modified:
   trunk/Gui/interface.h
   trunk/Gui/mplayer/gtk/fs.c
   trunk/Gui/mplayer/gtk/opts.c
   trunk/libvo/sub.h
   trunk/mencoder.c
   trunk/mplayer.h

Log:
Remove some of the worst "headers include headers which include
completely unrelated headers" mess.


Modified: trunk/Gui/interface.h
==============================================================================
--- trunk/Gui/interface.h	(original)
+++ trunk/Gui/interface.h	Wed Nov 29 15:08:24 2006
@@ -4,7 +4,6 @@
 
 #include "../config.h"
 #include "mplayer/play.h"
-#include "mplayer.h"
 #include "libvo/font_load.h"
 #include "cfg.h"
 
@@ -142,6 +141,8 @@
 #define guiFilenames	4
 #define guiALL		0xffffffff
 
+extern int use_gui;
+
 extern char *get_path(const char *filename); 
 
 extern void guiInit( void );

Modified: trunk/Gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/Gui/mplayer/gtk/fs.c	(original)
+++ trunk/Gui/mplayer/gtk/fs.c	Wed Nov 29 15:08:24 2006
@@ -7,6 +7,7 @@
 #include <unistd.h>
 
 #include "../gmplayer.h"
+#include "../../mplayer.h"
 
 #include "mplayer/pixmaps/up.xpm"
 #include "mplayer/pixmaps/dir.xpm"

Modified: trunk/Gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/Gui/mplayer/gtk/opts.c	(original)
+++ trunk/Gui/mplayer/gtk/opts.c	Wed Nov 29 15:08:24 2006
@@ -12,6 +12,7 @@
 #include "../../mixer.h"
 #include "../../libao2/audio_out.h"
 #include "../../libvo/video_out.h"
+#include "../../mplayer.h"
 
 #include "../app.h"
 #include "../cfg.h"

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	(original)
+++ trunk/libvo/sub.h	Wed Nov 29 15:08:24 2006
@@ -59,6 +59,9 @@
 
 #include "subreader.h"
 
+extern sub_data* subdata; //currently used subtitles
+extern subtitle* vo_sub;
+
 extern unsigned char* vo_osd_text;
 
 extern int vo_osd_progbar_type;

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Wed Nov 29 15:08:24 2006
@@ -199,7 +199,7 @@
 int   subcc_enabled=0;
 int   suboverlap_enabled = 1;
 
-static sub_data* subdata=NULL;
+sub_data* subdata=NULL;
 float sub_last_pts = -303;
 
 int auto_expand=1;

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	(original)
+++ trunk/mplayer.h	Wed Nov 29 15:08:24 2006
@@ -2,10 +2,6 @@
 #ifndef __MPLAYER_MAIN
 #define __MPLAYER_MAIN
 
-#include "libvo/sub.h"
-#include "subreader.h"
-
-extern int use_gui;
 extern char* current_module;
 
 extern char * dvd_device;
@@ -34,8 +30,6 @@
 extern int    sub_pos;
 extern int    sub_unicode;
 extern char * sub_cp;
-extern sub_data* subdata; //currently used subtitles  
-extern subtitle* vo_sub;
 extern int    suboverlap_enabled;
 
 extern char * filename;