summaryrefslogtreecommitdiffstats
path: root/mpvcore/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-22 03:04:57 +0200
committerwm4 <wm4@nowhere>2013-09-22 03:31:25 +0200
commitcc7f8ee6204ffbeac195623a6be59ab9bcc32622 (patch)
tree5a7026d8d36ffe1168c1d1ed70d27f98ad912732 /mpvcore/command.c
parentb0f7a26f1a6dc061db0a60908842371e7a010db2 (diff)
downloadmpv-cc7f8ee6204ffbeac195623a6be59ab9bcc32622.tar.bz2
mpv-cc7f8ee6204ffbeac195623a6be59ab9bcc32622.tar.xz
mplayer: attempt to make playback resume work with DVD/BD
The problem with DVD/BD and playback resume is that most often, the filename is just "dvd://", while the actual path to the DVD disk image is given with --dvd-device. But playback resume works on the filename only. Add a pretty bad hack that includes the path to the disk image if the filename starts with dvd://, and the same for BD respectively. (It's a bad hack, but I want to go to bed, so here we go. I might revert or improve it later, depending on user feedback.) We have to cleanup the global variable mess around the dvd_device. Ideally, this should go into MPOpts, but it isn't yet. Make the code paths in mplayer.c take MPOpts anyway.
Diffstat (limited to 'mpvcore/command.c')
-rw-r--r--mpvcore/command.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mpvcore/command.c b/mpvcore/command.c
index 9e1e5f1c56..413ca9d1e5 100644
--- a/mpvcore/command.c
+++ b/mpvcore/command.c
@@ -2411,7 +2411,8 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
talloc_free(pl);
if (!append && mpctx->playlist->first) {
- struct playlist_entry *e = mp_resume_playlist(mpctx->playlist);
+ struct playlist_entry *e =
+ mp_resume_playlist(mpctx->playlist, opts);
mp_set_playlist_entry(mpctx, e ? e : mpctx->playlist->first);
}
} else {