diff options
| author | wm4 <wm4@nowhere> | 2016-01-06 22:40:55 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-06 22:40:55 +0100 |
| commit | 35f43dfacbe3abc000c1f35e36355613cb7da896 (patch) | |
| tree | f21cae6345df3d6fa3a75b41444676a95b40ba2a /player/loadfile.c | |
| parent | b7e179f6d3dc13d76bfdf4d5712e23328219c603 (diff) | |
| download | mpv-35f43dfacbe3abc000c1f35e36355613cb7da896.tar.bz2 mpv-35f43dfacbe3abc000c1f35e36355613cb7da896.tar.xz | |
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.
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 4a7a71f421..ec4d19d3c5 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -836,6 +836,8 @@ static void transfer_playlist(struct MPContext *mpctx, struct playlist *pl) if (pl->first) { prepare_playlist(mpctx, pl); struct playlist_entry *new = pl->current; + if (mpctx->playlist->current) + playlist_add_redirect(pl, mpctx->playlist->current->filename); playlist_transfer_entries(mpctx->playlist, pl); // current entry is replaced if (mpctx->playlist->current) |