summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorvayne <vayne@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-26 17:30:20 +0000
committervayne <vayne@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-26 17:30:20 +0000
commit367dbc8384a58513f725fb60fdd777ab323d4079 (patch)
treee579b32b56949362e5f7b3846c24f412cc63090e /gui
parent9e14239422dd7eecbb1e67809e575d98fe000c41 (diff)
downloadmpv-367dbc8384a58513f725fb60fdd777ab323d4079.tar.bz2
mpv-367dbc8384a58513f725fb60fdd777ab323d4079.tar.xz
header / declarations cleanup, also fixes broken compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23141 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/win32/gui.h1
-rw-r--r--gui/win32/interface.c11
-rw-r--r--gui/win32/preferences.c7
-rw-r--r--gui/win32/wincfg.c1
4 files changed, 2 insertions, 18 deletions
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index 2d1094a86a..fa11fdb073 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -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 --git a/gui/win32/interface.c b/gui/win32/interface.c
index 3ec2b5bc85..cd67a1973d 100644
--- a/gui/win32/interface.c
+++ b/gui/win32/interface.c
@@ -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 --git a/gui/win32/preferences.c b/gui/win32/preferences.c
index 1929ad4a51..80c516b84e 100644
--- a/gui/win32/preferences.c
+++ b/gui/win32/preferences.c
@@ -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 --git a/gui/win32/wincfg.c b/gui/win32/wincfg.c
index 39f21a64de..901bcdfbb1 100644
--- a/gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
@@ -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"