From cc7f8ee6204ffbeac195623a6be59ab9bcc32622 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 22 Sep 2013 03:04:57 +0200 Subject: 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. --- mpvcore/mp_core.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mpvcore/mp_core.h') diff --git a/mpvcore/mp_core.h b/mpvcore/mp_core.h index 98096aa5fe..4b8a5fcef9 100644 --- a/mpvcore/mp_core.h +++ b/mpvcore/mp_core.h @@ -336,7 +336,8 @@ struct playlist_entry *mp_next_file(struct MPContext *mpctx, int direction, int mp_get_cache_percent(struct MPContext *mpctx); void mp_write_watch_later_conf(struct MPContext *mpctx); void mp_set_playlist_entry(struct MPContext *mpctx, struct playlist_entry *e); -struct playlist_entry *mp_resume_playlist(struct playlist *pl); +struct playlist_entry *mp_resume_playlist(struct playlist *playlist, + struct MPOpts *opts); void mp_force_video_refresh(struct MPContext *mpctx); void mp_print_version(int always); -- cgit v1.2.3