From aab523e18bd9392648dfcd9462f4ad3af1fa2b0e Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 9 Sep 2006 22:40:22 +0000
Subject: [PATCH] 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
---
 mplayer.c              | 5 +++--
 stream/stream_dvdnav.c | 4 +++-
 stream/stream_dvdnav.h | 2 +-
 3 files changed, 7 insertions(+), 4 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
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 162410883a..6e9eb37d9e 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -431,7 +431,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
 }
 
 
-int mp_dvdnav_handle_input(stream_t *stream, int cmd) {
+int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button) {
   dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv;
   dvdnav_t *nav = dvdnav_priv->dvdnav;
   dvdnav_status_t status;
@@ -467,6 +467,8 @@ int mp_dvdnav_handle_input(stream_t *stream, int cmd) {
       break;
   }
 
+  dvdnav_get_current_highlight(nav, button);
+
   return reset;
 }
 
diff --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h
index 2881534f98..bae181c8b9 100644
--- a/stream/stream_dvdnav.h
+++ b/stream/stream_dvdnav.h
@@ -43,6 +43,6 @@ int dvdnav_stream_sleeping(dvdnav_priv_t * dvdnav_priv);
 
 void dvdnav_stream_fullstart(dvdnav_priv_t *dvdnav_priv);
 unsigned int * dvdnav_stream_get_palette(dvdnav_priv_t * dvdnav_priv);
-int mp_dvdnav_handle_input(stream_t *stream, int cmd);
+int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button);
 
 #endif