summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-03 23:33:03 +0200
committerwm4 <wm4@nowhere>2015-08-03 23:49:14 +0200
commitf792f56440c33fae4f027518fe999daa9e8d3771 (patch)
treeabd7fb8f75a17e03a42696631543b4aa8aff2efc /player/command.c
parent59d44ecef17790739211c56e7b2ca5c2682d855a (diff)
downloadmpv-f792f56440c33fae4f027518fe999daa9e8d3771.tar.bz2
mpv-f792f56440c33fae4f027518fe999daa9e8d3771.tar.xz
player: remove higher-level remains of DVD/BD menu support
Nobody wanted to restore this, so it gets the boot. If anyone still wants to volunteer to restore menu support, this would be welcome. (I might even try it myself if I feel masochistic and like wasting a lot of time for nothing.) But if it does get restored, it should be done differently. There were many stupid things about how it was done. For example, it somehow tried to pull mp_nav_events through all the layers (including needing to "buffer" them in the demuxer), which was needlessly complicated. It could be done simpler. This code was already inactive, so this commit actually changes nothing. Also keep in mind that normal DVD/BD playback still works.
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/player/command.c b/player/command.c
index c8b61e5758..2c5d06cff8 100644
--- a/player/command.c
+++ b/player/command.c
@@ -686,24 +686,6 @@ static int mp_property_disc_title(void *ctx, struct m_property *prop,
return M_PROPERTY_NOT_IMPLEMENTED;
}
-static int mp_property_disc_menu(void *ctx, struct m_property *prop,
- int action, void *arg)
-{
- MPContext *mpctx = ctx;
- int state = mp_nav_in_menu(mpctx);
- if (state < 0)
- return M_PROPERTY_UNAVAILABLE;
- return m_property_flag_ro(action, arg, !!state);
-}
-
-static int mp_property_mouse_on_button(void *ctx, struct m_property *prop,
- int action, void *arg)
-{
- MPContext *mpctx = ctx;
- bool on = mp_nav_mouse_on_button(mpctx);
- return m_property_flag_ro(action, arg, on);
-}
-
/// Current chapter (RW)
static int mp_property_chapter(void *ctx, struct m_property *prop,
int action, void *arg)
@@ -3351,8 +3333,6 @@ static const struct m_property mp_properties[] = {
{"playtime-remaining", mp_property_playtime_remaining},
{"playback-time", mp_property_playback_time},
{"disc-title", mp_property_disc_title},
- {"disc-menu-active", mp_property_disc_menu},
- {"disc-mouse-on-button", mp_property_mouse_on_button},
{"chapter", mp_property_chapter},
{"edition", mp_property_edition},
{"disc-titles", mp_property_disc_titles},
@@ -4712,10 +4692,6 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
mp_input_disable_section(mpctx->input, cmd->args[0].v.s);
break;
- case MP_CMD_DISCNAV:
- mp_nav_user_input(mpctx, cmd->args[0].v.s);
- break;
-
case MP_CMD_AB_LOOP: {
double now = get_current_time(mpctx);
int r = 0;