From 41d6879236d2792300c57fc9825878ba4f634edd Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
Date: Thu, 24 Apr 2008 06:58:16 +0300
Subject: Move fullscreen to options struct

---
 cfg-mplayer.h    | 5 ++---
 libmpcodecs/vd.c | 4 ++--
 mplayer.h        | 1 -
 options.h        | 1 +
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 20276742e3..398e9100ab 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -25,7 +25,6 @@ extern char *vo_geometry;
 
 extern int opt_screen_size_x;
 extern int opt_screen_size_y;
-extern int fullscreen;
 extern int vidmode;
 
 extern char *ao_outputfilename;
@@ -179,8 +178,8 @@ const m_option_t mplayer_opts[]={
         {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
         {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	// start in fullscreen mode:
-	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	OPT_FLAG_ON("fs", fullscreen, 0),
+	OPT_FLAG_OFF("nofs", fullscreen, 0),
 	// set fullscreen switch method (workaround for buggy WMs)
 	{"fsmode", "-fsmode is obsolete, avoid it and use -fstype instead.\nIf you really want it, try -fsmode-dontuse, but don't report bugs!\n", CONF_TYPE_PRINT, CONF_RANGE, 0, 31, NULL},
 	{"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index a94ac9ff85..4362b2360a 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
+#include "options.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -110,7 +111,6 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
 #include "libvo/video_out.h"
 
 // libvo opts:
-int fullscreen=0;
 int vidmode=0;
 int softzoom=0;
 int flip=-1;
@@ -291,7 +291,7 @@ csp_again:
     }
   }
 
-  vocfg_flags = (fullscreen ? VOFLAG_FULLSCREEN:0)
+  vocfg_flags = (opts->fullscreen ? VOFLAG_FULLSCREEN:0)
       | (vidmode ? VOFLAG_MODESWITCHING:0)
       | (softzoom ? VOFLAG_SWSCALE:0)
       | (flip ? VOFLAG_FLIPPING:0);
diff --git a/mplayer.h b/mplayer.h
index e30ab9bf48..adfcf60938 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -37,7 +37,6 @@ extern int stream_cache_size;
 extern int autosync;
 
 // libmpcodecs:
-extern int fullscreen;
 extern int flip;
 
 extern int frame_dropping;
diff --git a/options.h b/options.h
index 7b46ab15e6..6048a6af99 100644
--- a/options.h
+++ b/options.h
@@ -8,6 +8,7 @@ typedef struct MPOpts {
     int vo_ontop;
     int vo_screenwidth;
     int vo_screenheight;
+    int fullscreen;
     int vo_dbpp;
     int correct_pts;
     int loop_times;
-- 
cgit v1.2.3