colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: added destination_time option and deprecated total_time (#399)

Browse Source 
`destination_time` accepts one of `total`, `playtime-remaining` (scaled by the current speed), `time-remaining` (remaining length of file).

`total_time` is deprecated, but still works as expected.
This commit is contained in:
Michael
2022-12-27 10:17:12 +02:00
committed by GitHub
parent ea371b5740
commit e66c8fbf88
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
script-opts/uosc.conf
View File

@@ -163,8 +163,8 @@ background=000000
background_text=ffffff background_text=ffffff
# Use only bold font weight throughout the whole UI # Use only bold font weight throughout the whole UI
font_bold=no font_bold=no
# Show total time instead of time remaining # One of `total`, `playtime-remaining` (scaled by the current speed), `time-remaining` (remaining length of file)
total_time=no destination_time=playtime-remaining
# Display sub second fraction in timestamps up to this precision # Display sub second fraction in timestamps up to this precision
time_precision=0 time_precision=0
# Display stream's buffered time in timeline if it's lower than this amount of seconds, 0 to disable # Display stream's buffered time in timeline if it's lower than this amount of seconds, 0 to disable

23
scripts/uosc.lua
View File

@@ -88,7 +88,8 @@ defaults = {
foreground_text = '000000', foreground_text = '000000',
background = '000000', background = '000000',
background_text = 'ffffff', background_text = 'ffffff',
total_time = false, total_time = false, -- deprecated by below
destination_time = 'playtime-remaining',
time_precision = 0, time_precision = 0,
font_bold = false, font_bold = false,
autohide = false, autohide = false,
@@ -112,6 +113,12 @@ if options.pause_on_click_shorter_than > 0 and options.click_threshold == 0 then
msg.warn('`pause_on_click_shorter_than` is deprecated. Use `click_threshold` and `click_command` instead.') msg.warn('`pause_on_click_shorter_than` is deprecated. Use `click_threshold` and `click_command` instead.')
options.click_threshold = options.pause_on_click_shorter_than options.click_threshold = options.pause_on_click_shorter_than
end end
if options.total_time and options.destination_time == 'playtime-remaining' then
msg.warn('`total_time` is deprecated. Use `destination_time` instead.')
options.destination_time = 'total'
elseif not itable_index_of({'total', 'playtime-remaining', 'time-remaining'}, options.destination_time) then
options.destination_time = 'playtime-remaining'
end
-- Ensure required environment configuration -- Ensure required environment configuration
if options.autoload then mp.commandv('set', 'keep-open-pause', 'no') end if options.autoload then mp.commandv('set', 'keep-open-pause', 'no') end
-- Color shorthands -- Color shorthands
@@ -285,7 +292,7 @@ state = {
speed = 1, speed = 1,
duration = nil, -- current media duration duration = nil, -- current media duration
time_human = nil, -- current playback time in human format time_human = nil, -- current playback time in human format
duration_or_remaining_time_human = nil, -- depends on options.total_time destination_time_human = nil, -- depends on options.destination_time
pause = mp.get_property_native('pause'), pause = mp.get_property_native('pause'),
chapters = {}, chapters = {},
current_chapter = nil, current_chapter = nil,
@@ -369,11 +376,15 @@ function update_human_times()
state.time_human = format_time(state.time) state.time_human = format_time(state.time)
if state.duration then if state.duration then
local speed = state.speed or 1 local speed = state.speed or 1
state.duration_or_remaining_time_human = format_time( if options.destination_time == 'playtime-remaining' then
options.total_time and state.duration or ((state.time - state.duration) / speed) state.destination_time_human = format_time((state.time - state.duration) / speed)
) elseif options.destination_time == 'total' then
state.destination_time_human = format_time(state.duration)
else
state.destination_time_human = format_time(state.time - state.duration)
end
else else
state.duration_or_remaining_time_human = nil state.destination_time_human = nil
end end
else else
state.time_human = nil state.time_human = nil

4
scripts/uosc_shared/elements/Timeline.lua
View File

@@ -333,8 +333,8 @@ function Timeline:render()
end end
-- End time -- End time
if state.duration_or_remaining_time_human then if state.destination_time_human then
draw_timeline_text(bbx - spacing, fcy, 6, state.duration_or_remaining_time_human, time_opts) draw_timeline_text(bbx - spacing, fcy, 6, state.destination_time_human, time_opts)
end end
end end