# HG changeset patch
# User reimar
# Date 1164809304 0
# Node ID b806ccbc6398b57f8691ba92da05c021a0234e58
# Parent  9d42ff736ea593be3f581b0e658a90e544afea1f
Remove some of the worst "headers include headers which include
completely unrelated headers" mess.

diff -r 9d42ff736ea5 -r b806ccbc6398 Gui/interface.h
--- a/Gui/interface.h	Wed Nov 29 13:49:48 2006 +0000
+++ b/Gui/interface.h	Wed Nov 29 14:08:24 2006 +0000
@@ -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 );
diff -r 9d42ff736ea5 -r b806ccbc6398 Gui/mplayer/gtk/fs.c
--- a/Gui/mplayer/gtk/fs.c	Wed Nov 29 13:49:48 2006 +0000
+++ b/Gui/mplayer/gtk/fs.c	Wed Nov 29 14:08:24 2006 +0000
@@ -7,6 +7,7 @@
 #include <unistd.h>
 
 #include "../gmplayer.h"
+#include "../../mplayer.h"
 
 #include "mplayer/pixmaps/up.xpm"
 #include "mplayer/pixmaps/dir.xpm"
diff -r 9d42ff736ea5 -r b806ccbc6398 Gui/mplayer/gtk/opts.c
--- a/Gui/mplayer/gtk/opts.c	Wed Nov 29 13:49:48 2006 +0000
+++ b/Gui/mplayer/gtk/opts.c	Wed Nov 29 14:08:24 2006 +0000
@@ -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"
diff -r 9d42ff736ea5 -r b806ccbc6398 libvo/sub.h
--- a/libvo/sub.h	Wed Nov 29 13:49:48 2006 +0000
+++ b/libvo/sub.h	Wed Nov 29 14:08:24 2006 +0000
@@ -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;
diff -r 9d42ff736ea5 -r b806ccbc6398 mencoder.c
--- a/mencoder.c	Wed Nov 29 13:49:48 2006 +0000
+++ b/mencoder.c	Wed Nov 29 14:08:24 2006 +0000
@@ -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;
diff -r 9d42ff736ea5 -r b806ccbc6398 mplayer.h
--- a/mplayer.h	Wed Nov 29 13:49:48 2006 +0000
+++ b/mplayer.h	Wed Nov 29 14:08:24 2006 +0000
@@ -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;