diff options
| author | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-08 23:19:49 +0000 |
|---|---|---|
| committer | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-08 23:19:49 +0000 |
| commit | de1af27fdb2ca84381cade1338dcc7ac47146398 (patch) | |
| tree | 2052ecab89a3e16c211e9ee1066a965d8af345ca /cfg-mplayer.h | |
| parent | bf2ccb9b4111e967ef11e87c780837b7c3fcc9a5 (diff) | |
| download | mpv-de1af27fdb2ca84381cade1338dcc7ac47146398.tar.bz2 mpv-de1af27fdb2ca84381cade1338dcc7ac47146398.tar.xz | |
-rootwin switch use vo_rootwin var for all vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12972 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index c0ce06f5d3..54946660f5 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -65,6 +65,7 @@ extern int vo_gamma_hue; extern char *vo_geometry; extern int vo_ontop; extern int vo_keepaspect; +extern int vo_rootwin; extern int opt_screen_size_x; extern int opt_screen_size_y; @@ -87,10 +88,6 @@ extern int vo_nomouse_input; extern int WinID; #endif -#ifdef MACOSX -extern int vo_rootwin; -#endif - #ifdef HAVE_AA extern int vo_aa_parseoption(m_option_t* conf, char *opt, char * param); extern void vo_aa_revertoption(m_option_t* opt,char* param); @@ -187,6 +184,7 @@ m_option_t mplayer_opts[]={ {"nofixed-vo", &fixed_vo, CONF_TYPE_FLAG,CONF_GLOBAL, 0, 0, NULL}, {"ontop", &vo_ontop, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noontop", &vo_ontop, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"dsp", "Use -ao oss:dsp_path.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, @@ -302,11 +300,6 @@ m_option_t mplayer_opts[]={ {"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 - -#ifdef MACOSX - {"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif #ifdef HAVE_XINERAMA |