summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authornplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-29 14:59:48 +0000
committernplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-29 14:59:48 +0000
commit41508ab12eef3858965702b5fd9ac615668b9a82 (patch)
tree321ea212abeff384f1ab9d923d7babb8ea0ec74c /libvo
parent1a16bb4a04e3de4e285cb70633b68f586240822c (diff)
downloadmpv-41508ab12eef3858965702b5fd9ac615668b9a82.tar.bz2
mpv-41508ab12eef3858965702b5fd9ac615668b9a82.tar.xz
add var vo_rootwin and -rootwin switch for mac osx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12913 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/video_out.c1
-rw-r--r--libvo/video_out.h1
-rw-r--r--libvo/vo_quartz.c5
3 files changed, 4 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 470166b605..c727d46ab1 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -44,6 +44,7 @@ int vo_ontop = 0;
int vo_adapter_num=0;
int vo_refresh_rate=0;
int vo_keepaspect=1;
+int vo_rootwin=0;
int vo_pts=0; // for hw decoding
float vo_fps=0; // for mp1e rte
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 7d83b2c97f..799c25615c 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -199,6 +199,7 @@ extern float vo_panscan;
extern int vo_adapter_num;
extern int vo_refresh_rate;
extern int vo_keepaspect;
+extern int vo_rootwin;
extern int vo_gamma_brightness;
extern int vo_gamma_saturation;
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index ce3b36f3cf..7f6207ceea 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -70,12 +70,11 @@ static MatrixRecord matrix;
static int EnterMoviesDone = 0;
static int get_image_done = 0;
+extern int vo_rootwin;
extern int vo_ontop;
extern int vo_fs; // user want fullscreen
static int vo_quartz_fs; // we are in fullscreen
-int WinID = -1;
-
static int winLevel = 1;
int levelList[] =
{
@@ -572,7 +571,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
if(vo_ontop)
window_ontop();
- if(WinID == 0)
+ if(vo_rootwin)
{
vo_fs = TRUE;
winLevel = 0;