From 0cce7b85238aef3c1455e475ede60be9af1980f9 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Thu, 29 Aug 2002 04:32:12 +0000 Subject: Use more Fkeys to jump to different DVD menus. We can now jump directly to Title, Root, Sub-Picture, Audio, Angle, PTT (Chapter) menus. CVS patchset: 2550 CVS date: 2002/08/29 04:32:12 --- src/input/input_dvd.c | 27 +++++++++++++++++++++++---- src/xine-engine/events.h | 5 +++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 0e5b6d39e..cce0dad39 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.64 2002/08/26 11:50:47 mroi Exp $ + * $Id: input_dvd.c,v 1.65 2002/08/29 04:32:12 jcdutton Exp $ * */ @@ -1043,15 +1043,30 @@ static void dvdnav_event_listener (void *this_gen, xine_event_t *event) { } switch(event->type) { - case XINE_EVENT_INPUT_MENU1: - dvdnav_menu_call(this->dvdnav, DVD_MENU_Root); - break; case XINE_EVENT_INPUT_MENU2: + printf( "MENU2 key hit.\n"); dvdnav_menu_call(this->dvdnav, DVD_MENU_Title); break; case XINE_EVENT_INPUT_MENU3: + printf( "MENU3 key hit.\n"); + dvdnav_menu_call(this->dvdnav, DVD_MENU_Root); + break; + case XINE_EVENT_INPUT_MENU4: + printf( "MENU3 key hit.\n"); + dvdnav_menu_call(this->dvdnav, DVD_MENU_Subpicture); + break; + case XINE_EVENT_INPUT_MENU5: + printf( "MENU3 key hit.\n"); dvdnav_menu_call(this->dvdnav, DVD_MENU_Audio); break; + case XINE_EVENT_INPUT_MENU6: + printf( "MENU3 key hit.\n"); + dvdnav_menu_call(this->dvdnav, DVD_MENU_Angle); + break; + case XINE_EVENT_INPUT_MENU7: + printf( "MENU3 key hit.\n"); + dvdnav_menu_call(this->dvdnav, DVD_MENU_Part); + break; case XINE_EVENT_INPUT_NEXT: dvdnav_next_pg_search(this->dvdnav); break; @@ -1442,6 +1457,10 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { /* * $Log: input_dvd.c,v $ + * Revision 1.65 2002/08/29 04:32:12 jcdutton + * Use more Fkeys to jump to different DVD menus. + * We can now jump directly to Title, Root, Sub-Picture, Audio, Angle, PTT (Chapter) menus. + * * Revision 1.64 2002/08/26 11:50:47 mroi * adapt to xine coding guidelines * diff --git a/src/xine-engine/events.h b/src/xine-engine/events.h index c0abeb20b..676bb085d 100644 --- a/src/xine-engine/events.h +++ b/src/xine-engine/events.h @@ -43,6 +43,7 @@ extern "C" { #define XINE_EVENT_UI_CHANNELS_CHANGED 5 /* inform ui that new channel info is available */ #define XINE_EVENT_UI_SET_TITLE 6 /* request title display change in ui */ #define XINE_EVENT_INPUT_MENU1 7 +#define XINE_EVENT_INPUT_MENU0 8 /* Escape key just a duplicate */ #define XINE_EVENT_INPUT_MENU2 8 #define XINE_EVENT_INPUT_MENU3 9 #define XINE_EVENT_INPUT_UP 10 @@ -61,6 +62,10 @@ extern "C" { #define XINE_EVENT_FRAME_CHANGE 23 #define XINE_EVENT_CLOSED_CAPTION 24 #define XINE_EVENT_INPUT_BUTTON_FORCE 25 +#define XINE_EVENT_INPUT_MENU4 26 +#define XINE_EVENT_INPUT_MENU5 27 +#define XINE_EVENT_INPUT_MENU6 28 +#define XINE_EVENT_INPUT_MENU7 29 #define XINE_EVENT_INPUT_NUMBER_0 30 #define XINE_EVENT_INPUT_NUMBER_1 31 -- cgit v1.2.3