diff options
| -rw-r--r-- | DOCS/man/en/input.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/en/options.rst | 5 | ||||
| -rw-r--r-- | core/cfg-mplayer.h | 1 | ||||
| -rw-r--r-- | core/command.c | 10 | ||||
| -rw-r--r-- | core/input/input.c | 1 | ||||
| -rw-r--r-- | video/out/vo.c | 1 | ||||
| -rw-r--r-- | video/out/vo.h | 2 | ||||
| -rw-r--r-- | video/out/x11_common.c | 3 |
8 files changed, 0 insertions, 24 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index a0d2ad00c4..221d6cbfba 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -297,7 +297,6 @@ colormatrix x see ``--colormatrix`` colormatrix-input-range x see ``--colormatrix-input-range`` colormatrix-output-range x see ``--colormatrix-output-range`` ontop x see ``--ontop`` -rootwin x see ``--rootwin`` border x see ``--border`` framedrop x see ``--framedrop`` gamma x see ``--gamma`` diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index e5570b5887..359a194480 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1706,11 +1706,6 @@ (udp:// only) Allows a socket to be reused by other processes as soon as it is closed. ---rootwin - Play movie in the root window (desktop background). Desktop background - images may cover the movie window, though. May not work with all video - output drivers. - --saturation=<-100-100> Adjust the saturation of the video signal (default: 0). You can get grayscale output with this option. Not supported by all video output diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 84024f7a6d..82d030ff1e 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -529,7 +529,6 @@ const m_option_t mplayer_opts[]={ OPT_STRINGLIST("ao", audio_driver_list, 0), OPT_FLAG("fixed-vo", fixed_vo, CONF_GLOBAL), OPT_FLAG("ontop", vo_ontop, 0), - {"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"border", &vo_border, CONF_TYPE_FLAG, 0, 0, 1, NULL}, OPT_STRING("mixer", mixer_device, 0), diff --git a/core/command.c b/core/command.c index 644b1d37b2..35083f4aa3 100644 --- a/core/command.c +++ b/core/command.c @@ -1025,14 +1025,6 @@ static int mp_property_ontop(m_option_t *prop, int action, void *arg, &mpctx->opts.vo_ontop, mpctx); } -/// Display in the root window (RW) -static int mp_property_rootwin(m_option_t *prop, int action, void *arg, - MPContext *mpctx) -{ - return mp_property_vo_flag(prop, action, arg, VOCTRL_ROOTWIN, - &vo_rootwin, mpctx); -} - /// Show window borders (RW) static int mp_property_border(m_option_t *prop, int action, void *arg, MPContext *mpctx) @@ -1388,7 +1380,6 @@ static const m_option_t mp_properties[] = { M_OPTION_PROPERTY_CUSTOM("colormatrix-output-range", mp_property_colormatrix_output_range), M_OPTION_PROPERTY_CUSTOM("ontop", mp_property_ontop), - M_OPTION_PROPERTY_CUSTOM("rootwin", mp_property_rootwin), M_OPTION_PROPERTY_CUSTOM("border", mp_property_border), M_OPTION_PROPERTY_CUSTOM("framedrop", mp_property_framedrop), M_OPTION_PROPERTY_CUSTOM_("gamma", mp_property_gamma, @@ -1504,7 +1495,6 @@ static struct property_osd_display { // video { "panscan", _("Panscan"), .osd_progbar = OSD_PANSCAN }, { "ontop", _("Stay on top") }, - { "rootwin", _("Rootwin") }, { "border", _("Border") }, { "framedrop", _("Framedrop") }, { "deinterlace", _("Deinterlace") }, diff --git a/core/input/input.c b/core/input/input.c index 6f611a8ef3..4496537317 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -223,7 +223,6 @@ static const struct legacy_cmd legacy_cmds[] = { {"vo_fullscreen", "no-osd cycle fullscreen"}, {"panscan", "add panscan"}, {"vo_ontop", "cycle ontop"}, - {"vo_rootwin", "cycle rootwin"}, {"vo_border", "cycle border"}, {"frame_drop", "cycle framedrop"}, {"gamma", "add gamma"}, diff --git a/video/out/vo.c b/video/out/vo.c index a2eda768e7..aa34f7704a 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -57,7 +57,6 @@ int vo_fsmode = 0; float vo_panscan = 0.0f; int vo_refresh_rate=0; int vo_keepaspect=1; -int vo_rootwin=0; int vo_border=1; int64_t WinID = -1; diff --git a/video/out/vo.h b/video/out/vo.h index a6b760d52f..f26ec1baff 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -60,7 +60,6 @@ enum mp_voctrl { VOCTRL_REDRAW_FRAME, VOCTRL_ONTOP, - VOCTRL_ROOTWIN, VOCTRL_BORDER, VOCTRL_SET_DEINTERLACE, @@ -316,7 +315,6 @@ extern int vo_fsmode; extern float vo_panscan; extern int vo_refresh_rate; extern int vo_keepaspect; -extern int vo_rootwin; extern int vo_border; extern int vo_nomouse_input; diff --git a/video/out/x11_common.c b/video/out/x11_common.c index a78ca11402..6b34e1cc65 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -433,9 +433,6 @@ int vo_x11_init(struct vo *vo) }; vo->x11 = x11; - if (vo_rootwin) - WinID = 0; // use root window - XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(NULL); |