History

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
  1. DOCS/man/osc.rst +0 −5
  2. player/lua/osc.lua +1 −4
DOCS/man/osc.rst+0−5
@@ -247,11 +247,6 @@ Configurable Options · 246 unmodified lines
247247
248248 Scale factor of the OSC when fullscreen
249249
250−``scaleforcedwindow``
251− Default: 2.0
252−
253− Scale factor of the OSC when rendered on a forced (dummy) window
254−
255250 ``vidscale``
256251 Default: yes
257252
player/lua/osc.lua+1−4
@@ -14,7 +14,6 @@ local user_opts = { · 13 unmodified lines
1414 idlescreen = true, -- show mpv logo on idle
1515 scalewindowed = 1, -- scaling of the controller when windowed
1616 scalefullscreen = 1, -- scaling of the controller when fullscreen
17− scaleforcedwindow = 2, -- scaling when rendered on a forced window
1817 vidscale = true, -- scale the controller with the video?
1918 valign = 0.8, -- vertical alignment, -1 (top) to 1 (bottom)
2019 halign = 0, -- horizontal alignment, -1 (left) to 1 (right)
@@ -1780,9 +1779,7 @@ function osc_init() · 1759 unmodified lines
17801779 local _, display_h, display_aspect = mp.get_osd_size()
17811780 local scale
17821781
1783− if mp.get_property("video") == "no" then -- dummy/forced window
1784− scale = user_opts.scaleforcedwindow
1785− elseif state.fullscreen then
1782+ if state.fullscreen then
17861783 scale = user_opts.scalefullscreen
17871784 else
17881785 scale = user_opts.scalewindowed

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t