summaryrefslogtreecommitdiffstats
path: root/stream
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 /stream
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 'stream')
-rw-r--r--stream/stream_dvdnav.c4
-rw-r--r--stream/stream_dvdnav.h2
2 files changed, 4 insertions, 2 deletions
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