# HG changeset patch
# User vayne
# Date 1177608620 0
# Node ID 21e29d5932c57508740ee259f00b21e3fed5cdf8
# Parent  8e52146c056fa82830637d9655940739ef8632bb
header / declarations cleanup, also fixes broken compilation.

diff -r 8e52146c056f -r 21e29d5932c5 gui/win32/gui.h
--- a/gui/win32/gui.h	Thu Apr 26 15:14:12 2007 +0000
+++ b/gui/win32/gui.h	Thu Apr 26 17:30:20 2007 +0000
@@ -24,6 +24,7 @@
 #ifndef _GUI_H
 #define _GUI_H
 #include "config.h"
+#include "mplayer.h"
 #include "playtree.h"
 #include "m_config.h"
 #include "skinload.h"
diff -r 8e52146c056f -r 21e29d5932c5 gui/win32/interface.c
--- a/gui/win32/interface.c	Thu Apr 26 15:14:12 2007 +0000
+++ b/gui/win32/interface.c	Thu Apr 26 17:30:20 2007 +0000
@@ -46,20 +46,9 @@
 #include <cdio/cdio.h>
 #endif
 
-extern m_obj_settings_t *vf_settings;
-extern void exit_player(const char *how);
-extern char *filename;
 extern int abs_seek_pos;
 extern float rel_seek_secs;
-extern int audio_id;
-extern int video_id;
-extern int dvdsub_id;
-extern int vobsub_id;
-extern int stream_cache_size;
-extern int autosync;
 extern int vcd_track;
-extern int dvd_title;
-extern float force_fps;
 extern af_cfg_t af_cfg;
 int guiWinID = 0;
 
diff -r 8e52146c056f -r 21e29d5932c5 gui/win32/preferences.c
--- a/gui/win32/preferences.c	Thu Apr 26 15:14:12 2007 +0000
+++ b/gui/win32/preferences.c	Thu Apr 26 17:30:20 2007 +0000
@@ -37,13 +37,6 @@
 #include "dialogs.h"
 #include "wincfg.h"
 
-extern int   vo_doublebuffering;
-extern int   vo_directrendering;
-extern int   frame_dropping;
-extern int   soft_vol;
-extern float audio_delay;
-extern int   osd_level;
-extern char  *dvd_device, *cdrom_device;
 extern char  *proc_priority;
 
 static void set_defaults(void);
diff -r 8e52146c056f -r 21e29d5932c5 gui/win32/wincfg.c
--- a/gui/win32/wincfg.c	Thu Apr 26 15:14:12 2007 +0000
+++ b/gui/win32/wincfg.c	Thu Apr 26 17:30:20 2007 +0000
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mplayer.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "m_config.h"