From 41fbcee1f557c3ddbfefc79b2b1b4719c6442265 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 12 Aug 2012 18:40:21 +0200 Subject: Remove dvdnav support (DVD menus) When the internal mplayer MPEG demuxer was removed (commit 1fde09db), the default demuxer when using dvdnav was set to libavformat. Now it turns out that this doesn't work with libavformat. It will terminate playback right after the audio runs out (instead of looping it like the video, or whatever it's supposed to do). I'm not sure what exactly the problem is, but since 1. even mplayer-svn can't handle DVD menus directly (missing highlights), 2. DVD menus are essentially worthless, and 3. I don't directly watch DVDs, don't bother with it and remove it. For basic playback, there's still libdvdread support. Also, use pkg-config for libdvdread, and drop support for in-tree libdvdread. Remove support for in-tree libdvdcss as well. --- parser-mpcmd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'parser-mpcmd.c') diff --git a/parser-mpcmd.c b/parser-mpcmd.c index 5a91c093f9..41cad67467 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -265,10 +265,9 @@ bool m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, // filename bstr file = p.arg; char *file0 = bstrdup0(NULL, p.arg); - int is_dvdnav = bstr_startswith0(file, "dvdnav://"); // expand DVD filename entries like dvd://1-3 into component titles - if (bstr_startswith0(file, "dvd://") || is_dvdnav) { - int offset = is_dvdnav ? 9 : 6; + if (bstr_startswith0(file, "dvd://")) { + int offset = 6; char *splitpos = strstr(file0 + offset, "-"); if (splitpos != NULL) { int start_title = strtol(file0 + offset, NULL, 10); @@ -284,8 +283,7 @@ bool m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, && (start_title < end_title)) { for (int j = start_title; j <= end_title; j++) { char entbuf[15]; - snprintf(entbuf, sizeof(entbuf), - is_dvdnav ? "dvdnav://%d" : "dvd://%d", j); + snprintf(entbuf, sizeof(entbuf), "dvd://%d", j); playlist_add_file(files, entbuf); } } else -- cgit v1.2.3