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. --- input/input.c | 4 ---- input/input.h | 11 ----------- 2 files changed, 15 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index 690321f7fe..98b135c349 100644 --- a/input/input.c +++ b/input/input.c @@ -197,10 +197,6 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_RUN, "run", { ARG_STRING } }, { MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", { ARG_INT, ARG_INT } }, -#ifdef CONFIG_DVDNAV - { MP_CMD_DVDNAV, "dvdnav", { ARG_STRING } }, -#endif - { MP_CMD_GET_VO_FULLSCREEN, "get_vo_fullscreen", }, { MP_CMD_GET_SUB_VISIBILITY, "get_sub_visibility", }, { MP_CMD_KEYDOWN_EVENTS, "key_down_event", { ARG_INT } }, diff --git a/input/input.h b/input/input.h index 0fccbb5233..04cefab46e 100644 --- a/input/input.h +++ b/input/input.h @@ -44,7 +44,6 @@ enum mp_command_type { MP_CMD_TV_STEP_CHANNEL_LIST, MP_CMD_VO_FULLSCREEN, MP_CMD_SUB_POS, - MP_CMD_DVDNAV, MP_CMD_SCREENSHOT, MP_CMD_PANSCAN, MP_CMD_MUTE, @@ -130,16 +129,6 @@ enum mp_command_type { MP_CMD_SWITCH_TITLE, MP_CMD_STOP, - /// DVDNAV commands - MP_CMD_DVDNAV_UP = 1000, - MP_CMD_DVDNAV_DOWN, - MP_CMD_DVDNAV_LEFT, - MP_CMD_DVDNAV_RIGHT, - MP_CMD_DVDNAV_MENU, - MP_CMD_DVDNAV_SELECT, - MP_CMD_DVDNAV_PREVMENU, - MP_CMD_DVDNAV_MOUSECLICK, - /// DVB commands MP_CMD_DVB_SET_CHANNEL = 5101, -- cgit v1.2.3