diff options
| author | filon <filon@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-07 19:38:39 +0000 |
|---|---|---|
| committer | filon <filon@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-07 19:38:39 +0000 |
| commit | a3385947b2140bda6fb85d1db5f3cea11aacb58c (patch) | |
| tree | 57261b2b02a7c8507909aa07a95092e8b937ab61 /cfg-mplayer.h | |
| parent | dd5bfcbc7ef693a260fcfb4e10fc9ddd548a17e2 (diff) | |
| download | mpv-a3385947b2140bda6fb85d1db5f3cea11aacb58c.tar.bz2 mpv-a3385947b2140bda6fb85d1db5f3cea11aacb58c.tar.xz | |
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
- help (-fstype help) also availabible
- support state BELOW (someone may want to use it...) and by -fstype none forcing of
not changing window layer (user request)
- drop icelayer option, it can be set by -fstype layer=<number>
- simplify vo_x11_fullscreen
- fs change code cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9318 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index f858308c2b..f68a6d7867 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -80,9 +80,10 @@ extern int ao_pcm_waveheader; #ifdef HAVE_X11 extern char *mDisplayName; extern int WinID; -extern int ice_layer; +extern int fs_layer; extern int stop_xscreensaver; extern int vo_x11_keepaspect; +extern char **vo_fstype_list; #endif #ifdef HAVE_AA @@ -274,6 +275,7 @@ static config_t mplayer_opts[]={ // start in fullscreen mode: {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, // set fullscreen switch method (workaround for buggy WMs) {"fsmode", "option 'fsmode' is obsolete, avoid using it! if you really want it, try -fsmode-dontuse, but don't report bugs with this option used!", CONF_TYPE_PRINT, CONF_RANGE, 0, 31, NULL}, {"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, @@ -294,7 +296,7 @@ static config_t mplayer_opts[]={ // x11,xv,xmga,xvidix {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL}, {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL}, - {"icelayer", &ice_layer, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL}, + {"icelayer", "Use -fstype layer:<number> instead. -icelayer was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"stop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nostop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |