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.

Guido Cella committed 2 years ago

Commit 4e5845a1 parent f220f0f2 files · +1 −9Browse files

Unified · Split

2 files

DOCS/man/osc.rst +0 −5
player/lua/osc.lua +1 −4

DOCS/man/osc.rst+0−5

@@ -247,11 +247,6 @@ Configurable Options · 246 unmodified lines
247		247
248	Scale factor of the OSC when fullscreen	248	Scale factor of the OSC when fullscreen
249		249
250	``scaleforcedwindow``
251	Default: 2.0
252
253	Scale factor of the OSC when rendered on a forced (dummy) window
254
255	``vidscale``	250	``vidscale``
256	Default: yes	251	Default: yes
257		252

player/lua/osc.lua+1−4

     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)
     local _, display_h, display_aspect = mp.get_osd_size()
     local scale
-    if mp.get_property("video") == "no" then -- dummy/forced window
+    if state.fullscreen then
-        scale = user_opts.scaleforcedwindow
-    elseif state.fullscreen then
         scale = user_opts.scalefullscreen
     else
         scale = user_opts.scalewindowed

osc.lua: remove scaleforcedwindow

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code