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

[ib]

Author: ib
Date: Thu Jun 16 13:52:44 2011
New Revision: 33625

Log:
Move key definitions for multimedia keyboards to libvo/wskeys.h,
making wm/wskeys.h finally obsolete.

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

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Thu Jun 16 13:45:47 2011	(r33624)
+++ trunk/gui/mplayer/mw.c	Thu Jun 16 13:52:44 2011	(r33625)
@@ -30,7 +30,6 @@
 #include "gui/skin/font.h"
 #include "gui/skin/skin.h"
 #include "gui/wm/ws.h"
-#include "gui/wm/wskeys.h"
 
 #include "help_mp.h"
 #include "libvo/x11_common.h"

Modified: trunk/libvo/wskeys.h
==============================================================================
--- trunk/libvo/wskeys.h	Thu Jun 16 13:45:47 2011	(r33624)
+++ trunk/libvo/wskeys.h	Thu Jun 16 13:52:44 2011	(r33625)
@@ -82,4 +82,16 @@
 #define wsGrayInsert    0x9e + 256
 #define wsGrayDelete    0x9f + 256
 
+// keys for multimedia keyboards
+
+#define wsXF86LowerVolume 0x11 + 256
+#define wsXF86RaiseVolume 0x13 + 256
+#define wsXF86Mute        0x12 + 256
+#define wsXF86Play        0x14 + 256
+#define wsXF86Pause       0x31 + 256
+#define wsXF86Stop        0x15 + 256
+#define wsXF86Prev        0x16 + 256
+#define wsXF86Next        0x17 + 256
+#define wsXF86Media       0x32 + 256
+
 #endif /* MPLAYER_WSKEYS_H */