[MPlayer-cvslog] r33619 - in trunk/gui: mplayer/mw.c wm/wskeys.h

[ib]

Author: ib
Date: Wed Jun 15 11:28:20 2011
New Revision: 33619

Log:
Get non-multimedia X11 key definitions from libvo/wskeys.h.

Modified:
   trunk/gui/mplayer/mw.c
   trunk/gui/wm/wskeys.h

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Wed Jun 15 01:05:02 2011	(r33618)
+++ trunk/gui/mplayer/mw.c	Wed Jun 15 11:28:20 2011	(r33619)
@@ -35,6 +35,7 @@
 #include "help_mp.h"
 #include "libvo/x11_common.h"
 #include "libvo/fastmemcpy.h"
+#include "libvo/wskeys.h"
 
 #include "stream/stream.h"
 #include "stream/url.h"

Modified: trunk/gui/wm/wskeys.h
==============================================================================
--- trunk/gui/wm/wskeys.h	Wed Jun 15 01:05:02 2011	(r33618)
+++ trunk/gui/wm/wskeys.h	Wed Jun 15 11:28:20 2011	(r33619)
@@ -19,11 +19,6 @@
 #ifndef MPLAYER_GUI_WSKEYS_H
 #define MPLAYER_GUI_WSKEYS_H
 
-#define wsEnter         0x0d + 256
-#define wsEscape        0x1b + 256
-#define wsGrayMul       0xaa + 256
-#define wsGrayDiv       0xaf + 256
-
 //Keys for multimedia keyboard
 
 #define wsXF86LowerVolume 0x11 + 256