From e1056dd5df0b9eee8a18ab55bcace8e48bd5933b Mon Sep 17 00:00:00 2001 From: nanahi <130121847+na-na-hi@users.noreply.github.com> Date: Thu, 16 May 2024 10:56:46 -0400 Subject: [PATCH] {stats,osc}.lua: respect --osd-scale-by-window by default This lets these scripts scale the elements with OSD by default. --- DOCS/interface-changes/osdscale.txt | 1 + DOCS/man/osc.rst | 2 +- DOCS/man/stats.rst | 2 +- player/lua/osc.lua | 2 +- player/lua/stats.lua | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DOCS/interface-changes/osdscale.txt b/DOCS/interface-changes/osdscale.txt index 8108ef1df0155..b8215d55c3c4f 100644 --- a/DOCS/interface-changes/osdscale.txt +++ b/DOCS/interface-changes/osdscale.txt @@ -1,2 +1,3 @@ change `vidscale` script option type to string for osc.lua change `vidscale` script option type to string for stats.lua +change `vidscale` default to auto for osc.lua and stats.lua diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 58387cd9b07ec..dc8dad7c2ff6b 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -248,7 +248,7 @@ Configurable Options Scale factor of the OSC when fullscreen ``vidscale`` - Default: yes + Default: auto Scale the OSC with the video. ``no`` tries to keep the OSC size constant as much as the window size allows. diff --git a/DOCS/man/stats.rst b/DOCS/man/stats.rst index fc95e8d6f226c..30ce0796dfe8c 100644 --- a/DOCS/man/stats.rst +++ b/DOCS/man/stats.rst @@ -199,7 +199,7 @@ Configurable Options Color used for drawing graphs. ``vidscale`` - Default: yes + Default: auto Scale the text and graphs with the video. ``no`` tries to keep the sizes constant. diff --git a/player/lua/osc.lua b/player/lua/osc.lua index 0b14042aee280..1cd88156e42ac 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -14,7 +14,7 @@ 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 - vidscale = "yes", -- scale the controller with the video? + vidscale = "auto", -- 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) barmargin = 0, -- vertical margin of top/bottombar diff --git a/player/lua/stats.lua b/player/lua/stats.lua index 3c12aad0de9ff..79986154e280c 100644 --- a/player/lua/stats.lua +++ b/player/lua/stats.lua @@ -60,7 +60,7 @@ local o = { shadow_y_offset = 0.0, shadow_color = "", alpha = "11", - vidscale = "yes", + vidscale = "auto", -- Custom header for ASS tags to style the text output. -- Specifying this will ignore the text style values above and just