diff options
| author | Martin D <luma.inc@gmail.com> | 2017-06-09 09:08:54 +0200 |
|---|---|---|
| committer | RiCON <wiiaboo@users.noreply.github.com> | 2017-06-09 11:13:24 +0100 |
| commit | 30cd963b25520089f56417eb2f946c98afeef073 (patch) | |
| tree | 3b634f3e7aaa20a608a253da40d279bfda7836d1 /player/lua | |
| parent | 5521d48b4b2e9fda1b6019c35ca329cccd81b5ac (diff) | |
| download | mpv-30cd963b25520089f56417eb2f946c98afeef073.tar.bz2 mpv-30cd963b25520089f56417eb2f946c98afeef073.tar.xz | |
ytdl_hook: don't override start time set by saved state
This affects resuming playback from a watch_later directory so that you can resume playback even for URLs that have a start parameter.
Diffstat (limited to 'player/lua')
| -rw-r--r-- | player/lua/ytdl_hook.lua | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua index 55546f2be8..d8476d86e3 100644 --- a/player/lua/ytdl_hook.lua +++ b/player/lua/ytdl_hook.lua @@ -19,6 +19,11 @@ local function option_was_set(name) false) end +-- return true if the option was set locally +local function option_was_set_locally(name) + return mp.get_property_bool("option-info/" ..name.. "/set-locally", false) +end + -- youtube-dl may set special http headers for some sites (user-agent, cookies) local function set_http_headers(http_headers) if not http_headers then @@ -195,7 +200,8 @@ local function add_single_video(json) -- set start time if not (json.start_time == nil) and - not option_was_set("start") then + not option_was_set("start") and + not option_was_set_locally("start") then msg.debug("Setting start to: " .. json.start_time .. " secs") mp.set_property("file-local-options/start", json.start_time) end |