diff options
author | wm4 <wm4@nowhere> | 2015-06-26 23:37:23 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-06-26 23:37:30 +0200 |
commit | 3b3170aedb4c8a9bfa32238f3b580feea22071f8 (patch) | |
tree | 2a28ca2a755d47153ffa558e95b487ee28db358e /stream | |
parent | d9b19390ad75bcf5f2b0d5ce5d1f034bd9b6ae15 (diff) | |
download | mpv-3b3170aedb4c8a9bfa32238f3b580feea22071f8.tar.bz2 mpv-3b3170aedb4c8a9bfa32238f3b580feea22071f8.tar.xz |
Disable DVD and BD menu support (to be removed)
DVD/BD menu support never worked right, and are a pain to maintain. In
particular, DVD menus never actually worked correctly, because
highlights were not rendered correctly. Fixing this requires major
effort, which I'm not interested to spend.
Most importantly, the requirement to switch streams without losing the
DVD/BD state caused major weirdness in the playback core. It was
implemented by somehow syncing the playback state to the DVD/BD
implementation (in stream_dvdnav.c etc.), and then reloading the demuxer
without destroying and recreating the stream. This caused a bunch of
special-cases which I'm looking forward to remove.
For now, don't just remove everything related to menu support and just
disable it. If someone volunteers, it can be restored (i.e. rewritten)
in a reasonable way. If nobody volunteers soon, it goes.
Diffstat (limited to 'stream')
-rw-r--r-- | stream/stream_bluray.c | 2 | ||||
-rw-r--r-- | stream/stream_dvdnav.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index dab0b41502..513ca5b0d7 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -744,6 +744,8 @@ static int bluray_stream_open(stream_t *s) int title_guess = BLURAY_DEFAULT_TITLE; if (b->use_nav) { + MP_FATAL(s, "BluRay menu support has been removed.\n"); + return STREAM_ERROR; const BLURAY_DISC_INFO *disc_info = bd_get_disc_info(b->bd); b->num_titles = disc_info->num_hdmv_titles + disc_info->num_bdj_titles; ++b->num_titles; // for BLURAY_TITLE_TOP_MENU diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index e2ea93d200..e9a78d398c 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -781,6 +781,8 @@ static int open_s(stream_t *stream) return STREAM_UNSUPPORTED; } } else { + MP_FATAL(stream, "DVD menu support has been removed.\n"); + return STREAM_ERROR; if (dvdnav_menu_call(priv->dvdnav, DVD_MENU_Root) != DVDNAV_STATUS_OK) dvdnav_menu_call(priv->dvdnav, DVD_MENU_Title); } |