From 4e5845ad03e5f481e6980781a0ed370fecb866fd Mon Sep 17 00:00:00 2001 From: Guido Cella Date: Sun, 12 May 2024 13:01:56 +0200 Subject: [PATCH] osc.lua: remove scaleforcedwindow This is unused since 4e013afd37 because the mpv logo and the "Drop files or URLs to play here." message are shown instead of the OSC controls. It has the adverse affect of making the OSC twice as big when playing videos with --lavfi-complex, because that makes the video property which osc.lua checks unavailable. --- DOCS/man/osc.rst | 5 ----- player/lua/osc.lua | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 6431495958..0a9b54c5cf 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -247,11 +247,6 @@ Configurable Options Scale factor of the OSC when fullscreen -``scaleforcedwindow`` - Default: 2.0 - - Scale factor of the OSC when rendered on a forced (dummy) window - ``vidscale`` Default: yes diff --git a/player/lua/osc.lua b/player/lua/osc.lua index 31db711f25..6388c3e988 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -14,7 +14,6 @@ local user_opts = { idlescreen = true, -- show mpv logo on idle scalewindowed = 1, -- scaling of the controller when windowed scalefullscreen = 1, -- scaling of the controller when fullscreen - scaleforcedwindow = 2, -- scaling when rendered on a forced window vidscale = true, -- scale the controller with the video? valign = 0.8, -- vertical alignment, -1 (top) to 1 (bottom) halign = 0, -- horizontal alignment, -1 (left) to 1 (right) @@ -1780,9 +1779,7 @@ function osc_init() local _, display_h, display_aspect = mp.get_osd_size() local scale - if mp.get_property("video") == "no" then -- dummy/forced window - scale = user_opts.scaleforcedwindow - elseif state.fullscreen then + if state.fullscreen then scale = user_opts.scalefullscreen else scale = user_opts.scalewindowed