From 7e2bb7b43948eeab67a03ba0e89dbf4761027073 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 28 Feb 2020 17:17:42 +0100 Subject: osc: use default hr-seek when dragging progress bar to seek The "seekbarkeyframes" option is now interpreted such if it's true, the player default is used. Too lazy to make this a choice option or whatever; the Lua option parser doesn't have support for that anyway. Someone who cares can adjust this. --- DOCS/man/osc.rst | 11 ++++++----- player/lua/osc.lua | 7 +++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 4d1222abaa..e1b7e8aaf5 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -179,11 +179,12 @@ Configurable Options ``seekbarkeyframes`` Default: yes - Controls the mode used to seek when dragging the seekbar. By default, - keyframes are used. If set to false, exact seeking on mouse drags - will be used instead. Keyframes are preferred, but exact seeks may be - useful in cases where keyframes cannot be found. Note that using exact - seeks can potentially make mouse dragging much slower. + Controls the mode used to seek when dragging the seekbar (default: true). If + set to true, default seeking mode is used (usually keyframes, but player + defaults and heuristics can change it to exact). If set to false, exact + seeking on mouse drags will be used instead. Keyframes are preferred, but + exact seeks may be useful in cases where keyframes cannot be found. Note + that using exact seeks can potentially make mouse dragging much slower. ``seekrangestyle`` Default: inverted diff --git a/player/lua/osc.lua b/player/lua/osc.lua index ec219a1fe0..e7b027cfb7 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -1960,8 +1960,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 -- cgit v1.2.3