Mercurial > mplayer.hg
changeset 12912:1f6bb2356d18
add var vo_rootwin and -rootwin switch for mac osx
| author | nplourde |
|---|---|
| date | Thu, 29 Jul 2004 14:59:48 +0000 |
| parents | 5dd9ab119bb3 |
| children | e7309a3b65f6 |
| files | cfg-mplayer.h libvo/video_out.c libvo/video_out.h libvo/vo_quartz.c |
| diffstat | 4 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Thu Jul 29 00:57:22 2004 +0000 +++ b/cfg-mplayer.h Thu Jul 29 14:59:48 2004 +0000 @@ -84,10 +84,11 @@ extern int stop_xscreensaver; extern char **vo_fstype_list; extern int vo_nomouse_input; +extern int WinID; #endif -#if defined(HAVE_X11) || defined(MACOSX) -extern int WinID; +#ifdef MACOSX +extern int vo_rootwin; #endif #ifdef HAVE_AA @@ -301,10 +302,11 @@ {"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0,0,-1,NULL}, + {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL}, #endif -#if defined(HAVE_X11) || defined(MACOSX) - {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL}, +#ifdef MACOSX + {"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif #ifdef HAVE_XINERAMA
--- a/libvo/video_out.c Thu Jul 29 00:57:22 2004 +0000 +++ b/libvo/video_out.c Thu Jul 29 14:59:48 2004 +0000 @@ -44,6 +44,7 @@ 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
--- a/libvo/video_out.h Thu Jul 29 00:57:22 2004 +0000 +++ b/libvo/video_out.h Thu Jul 29 14:59:48 2004 +0000 @@ -199,6 +199,7 @@ 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;
--- a/libvo/vo_quartz.c Thu Jul 29 00:57:22 2004 +0000 +++ b/libvo/vo_quartz.c Thu Jul 29 14:59:48 2004 +0000 @@ -70,12 +70,11 @@ 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 @@ if(vo_ontop) window_ontop(); - if(WinID == 0) + if(vo_rootwin) { vo_fs = TRUE; winLevel = 0;