diff --git a/src/patched_osc.lua b/src/patched_osc.lua index a46f9e8..e32ae3b 100644 --- a/src/patched_osc.lua +++ b/src/patched_osc.lua @@ -2,7 +2,7 @@ This is mpv's original player/lua/osc.lua patched to display thumbnails Sections are denoted with -- mpv_thumbnail_script.lua -- -Current osc.lua version: 69fb2ddbc7b8ccec31348be4b7357ad9a8d48896 +Current osc.lua version: 76b1ac57a4f49ff2c7f18b7e46aefa7fb3362984 ]]-- local assdraw = require 'mp.assdraw' @@ -53,33 +53,13 @@ local user_opts = { boxmaxchars = 80, -- title crop threshold for box layout boxvideo = false, -- apply osc_param.video_margins to video windowcontrols = "auto", -- whether to show window controls - windowcontrols_alignment = "right" -- which side to show window controls on + windowcontrols_alignment = "right", -- which side to show window controls on + greenandgrumpy = false, -- disable santa hat + livemarkers = true, -- update seekbar chapter markers on duration change } --- read_options may modify hidetimeout, so save the original default value in --- case the user set hidetimeout < 0 and we need the default instead. -local hidetimeout_def = user_opts.hidetimeout -- read options from config and command-line -opt.read_options(user_opts, "osc") -if user_opts.hidetimeout < 0 then - user_opts.hidetimeout = hidetimeout_def - msg.warn("hidetimeout cannot be negative. Using " .. user_opts.hidetimeout) -end - --- validate window control options -if user_opts.windowcontrols ~= "auto" and - user_opts.windowcontrols ~= "yes" and - user_opts.windowcontrols ~= "no" then - msg.warn("windowcontrols cannot be \"" .. - user_opts.windowcontrols .. "\". Ignoring.") - user_opts.windowcontrols = "auto" -end -if user_opts.windowcontrols_alignment ~= "right" and - user_opts.windowcontrols_alignment ~= "left" then - msg.warn("windowcontrols_alignment cannot be \"" .. - user_opts.windowcontrols_alignment .. "\". Ignoring.") - user_opts.windowcontrols_alignment = "right" -end +opt.read_options(user_opts, "osc", function(list) update_options(list) end) -- mpv_thumbnail_script.lua -- @@ -354,12 +334,15 @@ local state = { tc_ms = user_opts.timems, -- Should the timecodes display their time with milliseconds mp_screen_sizeX, mp_screen_sizeY, -- last screen-resolution, to detect resolution changes to issue reINITs initREQ = false, -- is a re-init request pending? + marginsREQ = false, -- is a margins update pending? last_mouseX, last_mouseY, -- last mouse position, to detect significant mouse movement + mouse_in_window = false, message_text, - message_timeout, + message_hide_timer, fullscreen = false, tick_timer = nil, tick_last_time = 0, -- when the last tick() was run + hide_timer = nil, cache_state = nil, idle = false, enabled = true, @@ -369,15 +352,31 @@ local state = { using_video_margins = false, border = true, maximized = false, + osd = mp.create_osd_overlay("ass-events"), } local window_control_box_width = 80 local tick_delay = 0.03 +local is_december = os.date("*t").month == 12 + -- -- Helperfunctions -- +function set_osd(res_x, res_y, text) + if state.osd.res_x == res_x and + state.osd.res_y == res_y and + state.osd.data == text then + return + end + state.osd.res_x = res_x + state.osd.res_y = res_y + state.osd.data = text + state.osd.z = 1000 + state.osd:update() +end + local margins_opts = { {"l", "video-margin-ratio-left"}, {"r", "video-margin-ratio-right"}, @@ -396,9 +395,13 @@ end -- return mouse position in virtual ASS coordinates (playresx/y) function get_virt_mouse_pos() - local sx, sy = get_virt_scale_factor() - local x, y = mp.get_mouse_pos() - return x * sx, y * sy + if state.mouse_in_window then + local sx, sy = get_virt_scale_factor() + local x, y = mp.get_mouse_pos() + return x * sx, y * sy + else + return -1, -1 + end end function set_virt_mouse_area(x0, y0, x1, y1, name) @@ -822,8 +825,38 @@ end -- Element Rendering -- +-- returns nil or a chapter element from the native property chapter-list +function get_chapter(possec) + local cl = mp.get_property_native("chapter-list", {}) + local ch = nil + + -- chapters might not be sorted by time. find nearest-before/at possec + for n=1, #cl do + if possec >= cl[n].time and (not ch or cl[n].time > ch.time) then + ch = cl[n] + end + end + return ch +end + function render_elements(master_ass) + -- when the slider is dragged or hovered and we have a target chapter name + -- then we use it instead of the normal title. we calculate it before the + -- render iterations because the title may be rendered before the slider. + state.forced_title = nil + local se, ae = state.slider_element, elements[state.active_element] + if se and (ae == se or (not ae and mouse_hit(se))) then + local dur = mp.get_property_number("duration", 0) + if dur > 0 then + local possec = get_slider_value(se) * dur / 100 -- of mouse pos + local ch = get_chapter(possec) + if ch and ch.title and ch.title ~= "" then + state.forced_title = "Chapter: " .. ch.title + end + end + end + for n=1, #elements do local element = elements[n] @@ -1147,12 +1180,20 @@ function show_message(text, duration) text = string.gsub(text, "\n", "\\N") state.message_text = text - state.message_timeout = mp.get_time() + duration + + if not state.message_hide_timer then + state.message_hide_timer = mp.add_timeout(0, request_tick) + end + state.message_hide_timer:kill() + state.message_hide_timer.timeout = duration + state.message_hide_timer:resume() + request_tick() end function render_message(ass) - if not(state.message_timeout == nil) and not(state.message_text == nil) - and state.message_timeout > mp.get_time() then + if state.message_hide_timer and state.message_hide_timer:is_enabled() and + state.message_text + then local _, lines = string.gsub(state.message_text, "\\N", "") local fontsize = tonumber(mp.get_property("options/osd-font-size")) @@ -1170,7 +1211,6 @@ function render_message(ass) ass:append(style .. state.message_text) else state.message_text = nil - state.message_timeout = nil end end @@ -1225,7 +1265,7 @@ function add_layout(name) alpha = {[1] = 0, [2] = 255, [3] = 88, [4] = 255}, } elseif (elements[name].type == "box") then - elements[name].layout.box = {radius = 0} + elements[name].layout.box = {radius = 0, hexagon = false} end return elements[name].layout @@ -1250,11 +1290,13 @@ function window_controls(topbar) -- Default alignment is "right" local controlbox_left = wc_geo.w - controlbox_w - local titlebox_left = wc_geo.x + 5 + local titlebox_left = wc_geo.x + local titlebox_right = wc_geo.w - controlbox_w if alignment == "left" then controlbox_left = wc_geo.x - titlebox_left = wc_geo.x + controlbox_w + 5 + titlebox_left = wc_geo.x + controlbox_w + titlebox_right = wc_geo.w end add_area("window-controls", @@ -1305,13 +1347,19 @@ function window_controls(topbar) -- Maximize: 🗖 /🗗 ne = new_element("maximize", "button") - if state.maximized then + if state.maximized or state.fullscreen then ne.content = "\238\132\148" else ne.content = "\238\132\147" end ne.eventresponder["mbtn_left_up"] = - function () mp.commandv("cycle", "window-maximized") end + function () + if state.fullscreen then + mp.commandv("cycle", "fullscreen") + else + mp.commandv("cycle", "window-maximized") + end + end lo = add_layout("maximize") lo.geometry = alignment == "left" and third_geo or second_geo lo.style = osc_styles.wcButtons @@ -1340,12 +1388,19 @@ function window_controls(topbar) title = title:gsub("\\n", " "):gsub("\\$", ""):gsub("{","\\{") return not (title == "") and title or "mpv" end + local left_pad = 5 + local right_pad = 10 lo = add_layout("wctitle") lo.geometry = - { x = titlebox_left, y = wc_geo.y - 3, an = 1, w = titlebox_w, h = wc_geo.h } + { x = titlebox_left + left_pad, y = wc_geo.y - 3, an = 1, + w = titlebox_w, h = wc_geo.h } lo.style = string.format("%s{\\clip(%f,%f,%f,%f)}", osc_styles.wcTitle, - titlebox_left, wc_geo.y - wc_geo.h, titlebox_w, wc_geo.y + wc_geo.h) + titlebox_left + left_pad, wc_geo.y - wc_geo.h, + titlebox_right - right_pad , wc_geo.y + wc_geo.h) + + add_area("window-controls-title", + titlebox_left, 0, titlebox_right, wc_geo.h) end -- @@ -1880,8 +1935,29 @@ function validate_user_opts() msg.warn("Using \"slider\" seekrangestyle together with \"bar\" seekbarstyle is not supported") user_opts.seekrangestyle = "inverted" end + + if user_opts.windowcontrols ~= "auto" and + user_opts.windowcontrols ~= "yes" and + user_opts.windowcontrols ~= "no" then + msg.warn("windowcontrols cannot be \"" .. + user_opts.windowcontrols .. "\". Ignoring.") + user_opts.windowcontrols = "auto" + end + if user_opts.windowcontrols_alignment ~= "right" and + user_opts.windowcontrols_alignment ~= "left" then + msg.warn("windowcontrols_alignment cannot be \"" .. + user_opts.windowcontrols_alignment .. "\". Ignoring.") + user_opts.windowcontrols_alignment = "right" + end end +function update_options(list) + validate_user_opts() + request_tick() + visibility_mode(user_opts.visibility, true) + update_duration_watch() + request_init() +end -- OSC INIT function osc_init() @@ -1914,8 +1990,7 @@ function osc_init() -- stop seeking with the slider to prevent skipping files state.active_element = nil - - + osc_param.video_margins = {l = 0, r = 0, t = 0, b = 0} elements = {} @@ -1932,7 +2007,8 @@ function osc_init() ne = new_element("title", "button") ne.content = function () - local title = mp.command_native({"expand-text", user_opts.title}) + local title = state.forced_title or + mp.command_native({"expand-text", user_opts.title}) -- escape ASS, and strip newlines and trailing slashes title = title:gsub("\\n", " "):gsub("\\$", ""):gsub("{","\\{") return not (title == "") and title or "mpv" @@ -2109,6 +2185,7 @@ function osc_init() ne = new_element("seekbar", "slider") ne.enabled = not (mp.get_property("percent-pos") == nil) + state.slider_element = ne.enabled and ne or nil -- used for forced_title ne.slider.markerF = function () local duration = mp.get_property_number("duration", nil) if not (duration == nil) then @@ -2166,8 +2243,11 @@ function osc_init() local seekto = get_slider_value(element) if (element.state.lastseek == nil) or (not (element.state.lastseek == seekto)) then - mp.commandv("seek", seekto, "absolute-percent", - user_opts.seekbarkeyframes and "keyframes" or "exact") + local flags = "absolute-percent" + if not user_opts.seekbarkeyframes then + flags = flags .. "+exact" + end + mp.commandv("seek", seekto, flags) element.state.lastseek = seekto end @@ -2226,9 +2306,9 @@ function osc_init() -- probably not a network stream return "" end - local dmx_cache = mp.get_property_number("demuxer-cache-duration") - if dmx_cache and (dmx_cache > state.dmx_cache * 1.1 or - dmx_cache < state.dmx_cache * 0.9) then + local dmx_cache = cache_state and cache_state["cache-duration"] + local thresh = math.min(state.dmx_cache * 0.05, 5) -- 5% or 5s + if dmx_cache and math.abs(dmx_cache - state.dmx_cache) >= thresh then state.dmx_cache = dmx_cache else dmx_cache = state.dmx_cache @@ -2274,21 +2354,45 @@ function osc_init() --do something with the elements prepare_elements() + update_margins() +end + +function reset_margins() + if state.using_video_margins then + for _, opt in ipairs(margins_opts) do + mp.set_property_number(opt[2], 0.0) + end + state.using_video_margins = false + end +end + +function update_margins() + local margins = osc_param.video_margins + + -- Don't use margins if it's visible only temporarily. + if (not state.osc_visible) or (get_hidetimeout() >= 0) or + (state.fullscreen and not user_opts.showfullscreen) or + (not state.fullscreen and not user_opts.showwindowed) + then + margins = {l = 0, r = 0, t = 0, b = 0} + end + if user_opts.boxvideo then -- check whether any margin option has a non-default value local margins_used = false - for _, opt in ipairs(margins_opts) do - if mp.get_property_number(opt[2], 0.0) ~= 0.0 then - margins_used = true + if not state.using_video_margins then + for _, opt in ipairs(margins_opts) do + if mp.get_property_number(opt[2], 0.0) ~= 0.0 then + margins_used = true + end end end if not margins_used then - local margins = osc_param.video_margins for _, opt in ipairs(margins_opts) do local v = margins[opt[1]] - if v ~= 0 then + if (v ~= 0) or state.using_video_margins then mp.set_property_number(opt[2], v) state.using_video_margins = true end @@ -2298,27 +2402,6 @@ function osc_init() reset_margins() end - update_margins() -end - -function reset_margins() - if state.using_video_margins then - for _, opt in ipairs(margins_opts) do - mp.set_property_number(opt[2], 0.0) - end - state.using_video_margins = false - end -end - -function update_margins() - local margins = osc_param.video_margins - - -- Don't report margins if it's visible only temporarily. At least for - -- console.lua this makes no sense. - if (not state.osc_visible) or (user_opts.hidetimeout >= 0) then - margins = {l = 0, r = 0, t = 0, b = 0} - end - utils.shared_script_property_set("osc-margins", string.format("%f,%f,%f,%f", margins.l, margins.r, margins.t, margins.b)) end @@ -2403,20 +2486,32 @@ function request_tick() end function mouse_leave() - if user_opts.hidetimeout >= 0 then + if get_hidetimeout() >= 0 then hide_osc() end -- reset mouse position state.last_mouseX, state.last_mouseY = nil, nil + state.mouse_in_window = false end function request_init() state.initREQ = true + request_tick() +end + +-- Like request_init(), but also request an immediate update +function request_init_resize() + request_init() + -- ensure immediate update + state.tick_timer:kill() + state.tick_timer.timeout = 0 + state.tick_timer:resume() end function render_wipe() msg.trace("render_wipe()") - mp.set_osd_ass(0, 0, "{}") + state.osd.data = "" -- allows set_osd to immediately update on enable + state.osd:remove() end function render() @@ -2429,14 +2524,21 @@ function render() if not (state.mp_screen_sizeX == current_screen_sizeX and state.mp_screen_sizeY == current_screen_sizeY) then - request_init() + request_init_resize() state.mp_screen_sizeX = current_screen_sizeX state.mp_screen_sizeY = current_screen_sizeY end -- init management - if state.initREQ then + if state.active_element then + -- mouse is held down on some element - keep ticking and igore initReq + -- till it's released, or else the mouse-up (click) will misbehave or + -- get ignored. that's because osc_init() recreates the osc elements, + -- but mouse handling depends on the elements staying unmodified + -- between mouse-down and mouse-up (using the index active_element). + request_tick() + elseif state.initREQ then osc_init() state.initREQ = false @@ -2532,12 +2634,32 @@ function render() end end - -- autohide - if not (state.showtime == nil) and (user_opts.hidetimeout >= 0) - and (state.showtime + (user_opts.hidetimeout/1000) < now) - and (state.active_element == nil) and not (mouse_over_osc) then + if osc_param.areas["window-controls-title"] then + for _,cords in ipairs(osc_param.areas["window-controls-title"]) do + if (mouse_hit_coords(cords.x1, cords.y1, cords.x2, cords.y2)) then + mouse_over_osc = true + end + end + end - hide_osc() + -- autohide + if not (state.showtime == nil) and (get_hidetimeout() >= 0) then + local timeout = state.showtime + (get_hidetimeout()/1000) - now + if timeout <= 0 then + if (state.active_element == nil) and not (mouse_over_osc) then + hide_osc() + end + else + -- the timer is only used to recheck the state and to possibly run + -- the code above again + if not state.hide_timer then + state.hide_timer = mp.add_timeout(0, tick) + end + state.hide_timer.timeout = timeout + -- re-arm + state.hide_timer:kill() + state.hide_timer:resume() + end end @@ -2564,12 +2686,8 @@ function render() -- // mpv_thumbnail_script.lua // -- -- submit - mp.set_osd_ass(osc_param.playresy * osc_param.display_aspect, - osc_param.playresy, ass.text) - - - - + set_osd(osc_param.playresy * osc_param.display_aspect, + osc_param.playresy, ass.text) end -- @@ -2630,6 +2748,8 @@ function process_event(source, what) elseif source == "mouse_move" then + state.mouse_in_window = true + local mouseX, mouseY = get_virt_mouse_pos() if (user_opts.minmousemove == 0) or (not ((state.last_mouseX == nil) or (state.last_mouseY == nil)) and @@ -2645,12 +2765,45 @@ function process_event(source, what) if element_has_action(elements[n], action) then elements[n].eventresponder[action](elements[n]) end - request_tick() end + + -- ensure rendering after any (mouse) event - icons could change etc + request_tick() end + +local logo_lines = { + -- White border + "{\\c&HE5E5E5&\\p6}m 895 10 b 401 10 0 410 0 905 0 1399 401 1800 895 1800 1390 1800 1790 1399 1790 905 1790 410 1390 10 895 10 {\\p0}", + -- Purple fill + "{\\c&H682167&\\p6}m 925 42 b 463 42 87 418 87 880 87 1343 463 1718 925 1718 1388 1718 1763 1343 1763 880 1763 418 1388 42 925 42{\\p0}", + -- Darker fill + "{\\c&H430142&\\p6}m 1605 828 b 1605 1175 1324 1456 977 1456 631 1456 349 1175 349 828 349 482 631 200 977 200 1324 200 1605 482 1605 828{\\p0}", + -- White fill + "{\\c&HDDDBDD&\\p6}m 1296 910 b 1296 1131 1117 1310 897 1310 676 1310 497 1131 497 910 497 689 676 511 897 511 1117 511 1296 689 1296 910{\\p0}", + -- Triangle + "{\\c&H691F69&\\p6}m 762 1113 l 762 708 b 881 776 1000 843 1119 911 1000 978 881 1046 762 1113{\\p0}", +} + +local santa_hat_lines = { + -- Pompoms + "{\\c&HC0C0C0&\\p6}m 500 -323 b 491 -322 481 -318 475 -311 465 -312 456 -319 446 -318 434 -314 427 -304 417 -297 410 -290 404 -282 395 -278 390 -274 387 -267 381 -265 377 -261 379 -254 384 -253 397 -244 409 -232 425 -228 437 -228 446 -218 457 -217 462 -216 466 -213 468 -209 471 -205 477 -203 482 -206 491 -211 499 -217 508 -222 532 -235 556 -249 576 -267 584 -272 584 -284 578 -290 569 -305 550 -312 533 -309 523 -310 515 -316 507 -321 505 -323 503 -323 500 -323{\\p0}", + "{\\c&HE0E0E0&\\p6}m 315 -260 b 286 -258 259 -240 246 -215 235 -210 222 -215 211 -211 204 -188 177 -176 172 -151 170 -139 163 -128 154 -121 143 -103 141 -81 143 -60 139 -46 125 -34 129 -17 132 -1 134 16 142 30 145 56 161 80 181 96 196 114 210 133 231 144 266 153 303 138 328 115 373 79 401 28 423 -24 446 -73 465 -123 483 -174 487 -199 467 -225 442 -227 421 -232 402 -242 384 -254 364 -259 342 -250 322 -260 320 -260 317 -261 315 -260{\\p0}", + -- Main cap + "{\\c&H0000F0&\\p6}m 1151 -523 b 1016 -516 891 -458 769 -406 693 -369 624 -319 561 -262 526 -252 465 -235 479 -187 502 -147 551 -135 588 -111 1115 165 1379 232 1909 761 1926 800 1952 834 1987 858 2020 883 2053 912 2065 952 2088 1000 2146 962 2139 919 2162 836 2156 747 2143 662 2131 615 2116 567 2122 517 2120 410 2090 306 2089 199 2092 147 2071 99 2034 64 1987 5 1928 -41 1869 -86 1777 -157 1712 -256 1629 -337 1578 -389 1521 -436 1461 -476 1407 -509 1343 -507 1284 -515 1240 -519 1195 -521 1151 -523{\\p0}", + -- Cap shadow + "{\\c&H0000AA&\\p6}m 1657 248 b 1658 254 1659 261 1660 267 1669 276 1680 284 1689 293 1695 302 1700 311 1707 320 1716 325 1726 330 1735 335 1744 347 1752 360 1761 371 1753 352 1754 331 1753 311 1751 237 1751 163 1751 90 1752 64 1752 37 1767 14 1778 -3 1785 -24 1786 -45 1786 -60 1786 -77 1774 -87 1760 -96 1750 -78 1751 -65 1748 -37 1750 -8 1750 20 1734 78 1715 134 1699 192 1694 211 1689 231 1676 246 1671 251 1661 255 1657 248 m 1909 541 b 1914 542 1922 549 1917 539 1919 520 1921 502 1919 483 1918 458 1917 433 1915 407 1930 373 1942 338 1947 301 1952 270 1954 238 1951 207 1946 214 1947 229 1945 239 1939 278 1936 318 1924 356 1923 362 1913 382 1912 364 1906 301 1904 237 1891 175 1887 150 1892 126 1892 101 1892 68 1893 35 1888 2 1884 -9 1871 -20 1859 -14 1851 -6 1854 9 1854 20 1855 58 1864 95 1873 132 1883 179 1894 225 1899 273 1908 362 1910 451 1909 541{\\p0}", + -- Brim and tip pompom + "{\\c&HF8F8F8&\\p6}m 626 -191 b 565 -155 486 -196 428 -151 387 -115 327 -101 304 -47 273 2 267 59 249 113 219 157 217 213 215 265 217 309 260 302 285 283 373 264 465 264 555 257 608 252 655 292 709 287 759 294 816 276 863 298 903 340 972 324 1012 367 1061 394 1125 382 1167 424 1213 462 1268 482 1322 506 1385 546 1427 610 1479 662 1510 690 1534 725 1566 752 1611 796 1664 830 1703 880 1740 918 1747 986 1805 1005 1863 991 1897 932 1916 880 1914 823 1945 777 1961 725 1979 673 1957 622 1938 575 1912 534 1862 515 1836 473 1790 417 1755 351 1697 305 1658 266 1633 216 1593 176 1574 138 1539 116 1497 110 1448 101 1402 77 1371 37 1346 -16 1295 15 1254 6 1211 -27 1170 -62 1121 -86 1072 -104 1027 -128 976 -133 914 -130 851 -137 794 -162 740 -181 679 -168 626 -191 m 2051 917 b 1971 932 1929 1017 1919 1091 1912 1149 1923 1214 1970 1254 2000 1279 2027 1314 2066 1325 2139 1338 2212 1295 2254 1238 2281 1203 2287 1158 2282 1116 2292 1061 2273 1006 2229 970 2206 941 2167 938 2138 918{\\p0}", +} + -- called by mpv on every frame function tick() + if state.marginsREQ == true then + update_margins() + state.marginsREQ = false + end + if (not state.enabled) then return end if (state.idle) then @@ -2658,31 +2811,28 @@ function tick() -- render idle message msg.trace("idle message") local icon_x, icon_y = 320 - 26, 140 + local line_prefix = ("{\\rDefault\\an7\\1a&H00&\\bord0\\shad0\\pos(%f,%f)}"):format(icon_x, icon_y) local ass = assdraw.ass_new() - ass:new_event() - ass:pos(icon_x, icon_y) - ass:append("{\\rDefault\\an7\\c&H430142&\\1a&H00&\\bord0\\shad0\\p6}m 1605 828 b 1605 1175 1324 1456 977 1456 631 1456 349 1175 349 828 349 482 631 200 977 200 1324 200 1605 482 1605 828{\\p0}") - ass:new_event() - ass:pos(icon_x, icon_y) - ass:append("{\\rDefault\\an7\\c&HDDDBDD&\\1a&H00&\\bord0\\shad0\\p6}m 1296 910 b 1296 1131 1117 1310 897 1310 676 1310 497 1131 497 910 497 689 676 511 897 511 1117 511 1296 689 1296 910{\\p0}") - ass:new_event() - ass:pos(icon_x, icon_y) - ass:append("{\\rDefault\\an7\\c&H691F69&\\1a&H00&\\bord0\\shad0\\p6}m 762 1113 l 762 708 b 881 776 1000 843 1119 911 1000 978 881 1046 762 1113{\\p0}") - ass:new_event() - ass:pos(icon_x, icon_y) - ass:append("{\\rDefault\\an7\\c&H682167&\\1a&H00&\\bord0\\shad0\\p6}m 925 42 b 463 42 87 418 87 880 87 1343 463 1718 925 1718 1388 1718 1763 1343 1763 880 1763 418 1388 42 925 42 m 925 42 m 977 200 b 1324 200 1605 482 1605 828 1605 1175 1324 1456 977 1456 631 1456 349 1175 349 828 349 482 631 200 977 200{\\p0}") - ass:new_event() - ass:pos(icon_x, icon_y) - ass:append("{\\rDefault\\an7\\c&H753074&\\1a&H00&\\bord0\\shad0\\p6}m 977 198 b 630 198 348 480 348 828 348 1176 630 1458 977 1458 1325 1458 1607 1176 1607 828 1607 480 1325 198 977 198 m 977 198 m 977 202 b 1323 202 1604 483 1604 828 1604 1174 1323 1454 977 1454 632 1454 351 1174 351 828 351 483 632 202 977 202{\\p0}") - ass:new_event() - ass:pos(icon_x, icon_y) - ass:append("{\\rDefault\\an7\\c&HE5E5E5&\\1a&H00&\\bord0\\shad0\\p6}m 895 10 b 401 10 0 410 0 905 0 1399 401 1800 895 1800 1390 1800 1790 1399 1790 905 1790 410 1390 10 895 10 m 895 10 m 925 42 b 1388 42 1763 418 1763 880 1763 1343 1388 1718 925 1718 463 1718 87 1343 87 880 87 418 463 42 925 42{\\p0}") + -- mpv logo + for i, line in ipairs(logo_lines) do + ass:new_event() + ass:append(line_prefix .. line) + end + + -- Santa hat + if is_december and not user_opts.greenandgrumpy then + for i, line in ipairs(santa_hat_lines) do + ass:new_event() + ass:append(line_prefix .. line) + end + end + ass:new_event() ass:pos(320, icon_y+65) ass:an(8) ass:append("Drop files or URLs to play here.") - mp.set_osd_ass(640, 360, ass.text) + set_osd(640, 360, ass.text) if state.showhide_enabled then mp.disable_key_bindings("showhide") @@ -2698,7 +2848,7 @@ function tick() render() else -- Flush OSD - mp.set_osd_ass(osc_param.playresy, osc_param.playresy, "") + render_wipe() end state.tick_last_time = mp.get_time() @@ -2732,6 +2882,28 @@ function enable_osc(enable) end end +-- duration is observed for the sole purpose of updating chapter markers +-- positions. live streams with chapters are very rare, and the update is also +-- expensive (with request_init), so it's only observed when we have chapters +-- and the user didn't disable the livemarkers option (update_duration_watch). +function on_duration() request_init() end + +local duration_watched = false +function update_duration_watch() + local want_watch = user_opts.livemarkers and + (mp.get_property_number("chapters", 0) or 0) > 0 and + true or false -- ensure it's a boolean + + if (want_watch ~= duration_watched) then + if want_watch then + mp.observe_property("duration", nil, on_duration) + else + mp.unobserve_property(on_duration) + end + duration_watched = want_watch + end +end + -- mpv_thumbnail_script.lua -- local builtin_osc_enabled = mp.get_property_native('osc') @@ -2747,11 +2919,16 @@ end -- // mpv_thumbnail_script.lua // -- validate_user_opts() +update_duration_watch() mp.register_event("shutdown", shutdown) mp.register_event("start-file", request_init) -mp.register_event("tracks-changed", request_init) +mp.observe_property("track-list", nil, request_init) mp.observe_property("playlist", nil, request_init) +mp.observe_property("chapter-list", nil, function() + update_duration_watch() + request_init() +end) mp.register_script_message("osc-message", show_message) mp.register_script_message("osc-chapterlist", function(dur) @@ -2771,19 +2948,20 @@ end) mp.observe_property("fullscreen", "bool", function(name, val) state.fullscreen = val - request_init() + state.marginsREQ = true + request_init_resize() end ) mp.observe_property("border", "bool", function(name, val) state.border = val - request_init() + request_init_resize() end ) mp.observe_property("window-maximized", "bool", function(name, val) state.maximized = val - request_init() + request_init_resize() end ) mp.observe_property("idle-active", "bool", @@ -2800,6 +2978,11 @@ end) mp.observe_property("playback-time", "number", function(name, val) request_tick() end) +mp.observe_property("osd-dimensions", "native", function(name, val) + -- (we could use the value instead of re-querying it all the time, but then + -- we might have to worry about property update ordering) + request_init_resize() +end) -- mouse show/hide bindings mp.set_key_bindings({ @@ -2837,15 +3020,20 @@ mp.set_key_bindings({ }, "window-controls", "force") mp.enable_key_bindings("window-controls") -user_opts.hidetimeout_orig = user_opts.hidetimeout +function get_hidetimeout() + if user_opts.visibility == "always" then + return -1 -- disable autohide + end + return user_opts.hidetimeout +end function always_on(val) - if val then - user_opts.hidetimeout = -1 -- disable autohide - if state.enabled then show_osc() end - else - user_opts.hidetimeout = user_opts.hidetimeout_orig - if state.enabled then hide_osc() end + if state.enabled then + if val then + show_osc() + else + hide_osc() + end end end @@ -2855,7 +3043,7 @@ function visibility_mode(mode, no_osd) if mode == "cycle" then if not state.enabled then mode = "auto" - elseif user_opts.hidetimeout >= 0 then + elseif user_opts.visibility ~= "always" then mode = "always" else mode = "never" @@ -2875,11 +3063,21 @@ function visibility_mode(mode, no_osd) return end + user_opts.visibility = mode + if not no_osd and tonumber(mp.get_property("osd-level")) >= 1 then mp.osd_message("OSC visibility: " .. mode) end + -- Reset the input state on a mode change. The input state will be + -- recalcuated on the next render cycle, except in 'never' mode where it + -- will just stay disabled. + mp.disable_key_bindings("input") + mp.disable_key_bindings("window-controls") + state.input_enabled = false + update_margins() + request_tick() end visibility_mode(user_opts.visibility, true)