From 35f43dfacbe3abc000c1f35e36355613cb7da896 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 6 Jan 2016 22:40:55 +0100 Subject: player: make watch later/resume work when "playing" directories If you do "mpv /bla/", and then branch out into sub-directories using playlist navigation, and then used quit and watch later, then playing the same directory did not resume from the previous point. This was because resuming is based on the path hash, so a path prefix can't be detected when resuming the parent directory. Solve this by writing each path prefix when playing directories is involved. (This includes all parent paths, so interestingly, "mpv /" would also resume in the above example.) Something like this was requested multiple times, and I want it too. --- common/playlist.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'common/playlist.c') diff --git a/common/playlist.c b/common/playlist.c index 9fd087be67..fe197a8ded 100644 --- a/common/playlist.c +++ b/common/playlist.c @@ -206,6 +206,18 @@ void playlist_add_base_path(struct playlist *pl, bstr base_path) } } +// Add redirected_from as new redirect entry to each item in pl. +void playlist_add_redirect(struct playlist *pl, const char *redirected_from) +{ + for (struct playlist_entry *e = pl->first; e; e = e->next) { + if (e->num_redirects >= 10) // arbitrary limit for sanity + break; + char *s = talloc_strdup(e, redirected_from); + if (s) + MP_TARRAY_APPEND(e, e->redirects, e->num_redirects, s); + } +} + // Move all entries from source_pl to pl, appending them after the current entry // of pl. source_pl will be empty, and all entries have changed ownership to pl. void playlist_transfer_entries(struct playlist *pl, struct playlist *source_pl) -- cgit v1.2.3