RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 06:42:03 +00:00
Code Issues Releases Wiki Activity

osc: refactor cache status display

Browse Source 
This removes the twitch of the right-aligned cache status.
This commit is contained in:
Ricardo Constantino 2017-02-03 03:24:02 +00:00
parent bcb2db078c
commit 03b2710dc8
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
player/lua/osc.lua
View File

@ -1776,19 +1776,26 @@ function osc_init()
ne.content = function () ne.content = function ()
local dmx_cache = mp.get_property_number("demuxer-cache-duration") local dmx_cache = mp.get_property_number("demuxer-cache-duration")
if not (dmx_cache == nil) then
dmx_cache = math.floor(dmx_cache + 0.5) .. "s + "
else
dmx_cache = ""
end
local cache_used = mp.get_property_number("cache-used") local cache_used = mp.get_property_number("cache-used")
if not (cache_used == nil) then local is_network = mp.get_property_native("demuxer-via-network")
if (cache_used < 1024) then if dmx_cache then
cache_used = cache_used .. " KB" dmx_cache = string.format("%3.0fs", dmx_cache)
else end
cache_used = math.floor((cache_used/102.4)+0.5)/10 .. " MB" if cache_used then
local suffix = " KiB"
if (cache_used >= 1024) then
cache_used = cache_used/1024
suffix = " MiB"
end end
return ("Cache: " .. dmx_cache .. cache_used) cache_used = string.format("%5.1f%s", cache_used, suffix)
end
if (is_network and dmx_cache) or cache_used then
-- Only show dmx-cache-duration by itself if it's a network file.
-- Cache can be forced even for local files, so always show that.
return string.format("Cache: %s%s%s",
(dmx_cache and dmx_cache or ""),
((dmx_cache and cache_used) and " + " or ""),
(cache_used or ""))
else else
return "" return ""
end end