summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-14 14:33:16 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-14 14:33:16 +0000
commit6448809568dba98177ec36ddc9df347073a65402 (patch)
treedccd34dfd4f2580fece8a7afe4dd9b8f21dd50d0 /gui
parentdc32369107443eb9f5f1056cce1e07e3bee0e5c2 (diff)
downloadmpv-6448809568dba98177ec36ddc9df347073a65402.tar.bz2
mpv-6448809568dba98177ec36ddc9df347073a65402.tar.xz
Move GUI-related extern declarations to a GUI header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30578 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/cfg.c1
-rw-r--r--gui/interface.c1
-rw-r--r--gui/mplayer/gmplayer.h5
-rw-r--r--gui/mplayer/gtk/opts.c1
4 files changed, 8 insertions, 0 deletions
diff --git a/gui/cfg.c b/gui/cfg.c
index b4afaad13c..11557d1214 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -37,6 +37,7 @@
#include "cfg.h"
#include "app.h"
#include "interface.h"
+#include "mplayer/gmplayer.h"
#include "mplayer/play.h"
// --- params
diff --git a/gui/interface.c b/gui/interface.c
index 451caee21e..9d57caf2c3 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -38,6 +38,7 @@
#include "help_mp.h"
#include "get_path.h"
#include "mp_core.h"
+#include "mplayer.h"
#include "libvo/x11_common.h"
#include "libvo/video_out.h"
#include "libvo/font_load.h"
diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index 636e6ab570..279cad0753 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -29,6 +29,11 @@ extern int mainVisible;
extern int mplMainAutoPlay;
extern int mplMiddleMenu;
+extern char * dvd_device;
+extern char * cdrom_device;
+extern int fullscreen;
+extern int flip;
+
void mplInit( void * disp );
void mplMainDraw( void );
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index e4d491e60d..f086819763 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -39,6 +39,7 @@
#include "gui/app.h"
#include "gui/cfg.h"
#include "gui/interface.h"
+#include "gui/mplayer/gmplayer.h"
#include "gui/mplayer/widgets.h"
#include "opts.h"
#include "fs.h"