[xine-cvs] CVS: gnome-xine/src actions.c,1.12,1.13 actions.h,1.6,1.7 gtkxine.c,1.40,1.41 main.c,1.45,1.46

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory usw-pr-cvs1:/tmp/cvs-serv16564/src

Modified Files:
	actions.c actions.h gtkxine.c main.c 
Log Message:
fix dvd menu buttons

Index: actions.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/actions.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- actions.c	26 Oct 2002 18:30:27 -0000	1.12
+++ actions.c	27 Oct 2002 23:41:49 -0000	1.13
@@ -143,34 +143,11 @@
   gtk_window_set_focus(GTK_WINDOW (app), NULL);
 }
 
-void action_menu_up (void) {
+void action_menu (int type) {
   xine_event_t   xine_event;
 
-  xine_event.type = XINE_EVENT_INPUT_UP;
-  gtk_xine_event_send (GTK_XINE (gtx) , &xine_event);
-}
-void action_menu_down (void) {
-  xine_event_t   xine_event;
-
-  xine_event.type = XINE_EVENT_INPUT_DOWN;
-  gtk_xine_event_send (GTK_XINE (gtx) , &xine_event);
-}
-void action_menu_left (void) {
-  xine_event_t   xine_event;
-
-  xine_event.type = XINE_EVENT_INPUT_LEFT;
-  gtk_xine_event_send (GTK_XINE (gtx) , &xine_event);
-}
-void action_menu_right (void) {
-  xine_event_t   xine_event;
-
-  xine_event.type = XINE_EVENT_INPUT_RIGHT;
-  gtk_xine_event_send (GTK_XINE (gtx) , &xine_event);
-}
-void action_menu_select (void) {
-  xine_event_t   xine_event;
-
-  xine_event.type = XINE_EVENT_INPUT_SELECT;
+  xine_event.type        = type;
+  xine_event.data_length = 0;
   gtk_xine_event_send (GTK_XINE (gtx) , &xine_event);
 }
 

Index: actions.h
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/actions.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- actions.h	26 Oct 2002 18:30:27 -0000	1.6
+++ actions.h	27 Oct 2002 23:41:49 -0000	1.7
@@ -43,11 +43,7 @@
 
 void action_seek_absolute (int percent) ;
 
-void action_menu_up (void);
-void action_menu_down (void);
-void action_menu_left (void);
-void action_menu_right (void);
-void action_menu_select (void);
+void action_menu (int type);
 
 void action_save_state (void);
 

Index: gtkxine.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/gtkxine.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gtkxine.c	27 Oct 2002 19:31:37 -0000	1.40
+++ gtkxine.c	27 Oct 2002 23:41:49 -0000	1.41
@@ -164,9 +164,11 @@
 
   xine_init (this->xine);
 
+#if 0
   printf ("gtkxine: extensions: '%s'\n",
 	  xine_get_file_extensions (this->xine));
   printf ("gtkxine: mimetypes: '%s'\n", xine_get_mime_types (this->xine));
+#endif
 
 }
 

Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- main.c	26 Oct 2002 23:59:41 -0000	1.45
+++ main.c	27 Oct 2002 23:41:49 -0000	1.46
@@ -594,20 +594,33 @@
   case GDK_Right:
     action_seek_relative (60);
     break;
+  case GDK_KP_8:
   case GDK_KP_Up:
-    action_menu_up ();
+    action_menu (XINE_EVENT_INPUT_UP);
     break;
+  case GDK_KP_2:
   case GDK_KP_Down:
-    action_menu_down ();
+    action_menu (XINE_EVENT_INPUT_DOWN);
     break;
+  case GDK_KP_4:
   case GDK_KP_Left:
-    action_menu_left ();
+    action_menu (XINE_EVENT_INPUT_LEFT);
     break;
+  case GDK_KP_6:
   case GDK_KP_Right:
-    action_menu_right ();
+    action_menu (XINE_EVENT_INPUT_RIGHT);
     break;
   case GDK_KP_Enter:
-    action_menu_select ();
+    action_menu (XINE_EVENT_INPUT_SELECT);
+    break;
+  case GDK_F1:
+    action_menu (XINE_EVENT_INPUT_MENU1);
+    break;
+  case GDK_F2:
+    action_menu (XINE_EVENT_INPUT_MENU2);
+    break;
+  case GDK_F3:
+    action_menu (XINE_EVENT_INPUT_MENU2);
     break;
   case GDK_1:
     action_seek_absolute (10);