summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-09 22:40:22 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-09 22:40:22 +0000
commitaab523e18bd9392648dfcd9462f4ad3af1fa2b0e (patch)
treecf0dabe2b23b043fcdd223622b85a635f95be8b1 /mplayer.c
parentb464da0a00cad6ec42060fada10712691b1a6326 (diff)
downloadmpv-aab523e18bd9392648dfcd9462f4ad3af1fa2b0e.tar.bz2
mpv-aab523e18bd9392648dfcd9462f4ad3af1fa2b0e.tar.xz
in mp_dvdnav_handle_input() assign the currently selected button, shown in the OSD by main()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19780 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index f3b86acfaa..d1a6b1c15d 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -5141,12 +5141,13 @@ if(step_sec>0) {
} break;
#ifdef USE_DVDNAV
case MP_CMD_DVDNAV: {
+ int button = 0;
if(stream->type != STREAMTYPE_DVDNAV) break;
- if(mp_dvdnav_handle_input(stream, cmd->args[0].v.i)) {
+ if(mp_dvdnav_handle_input(stream, cmd->args[0].v.i, &button)) {
uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
goto goto_enable_cache;
- }
+ } else if(button) set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, "Selected button number %d", button);
break;
}
#endif