# HG changeset patch
# User ib
# Date 1308225164 0
# Node ID cceb74e98445a2e929fdbd022d00f013e37f2e1e
# Parent  fc140241016359e43e573ee1eb2ab578597d36c1
Move key definitions for multimedia keyboards to libvo/wskeys.h,
making wm/wskeys.h finally obsolete.

diff -r fc1402410163 -r cceb74e98445 gui/mplayer/mw.c
--- a/gui/mplayer/mw.c	Thu Jun 16 11:45:47 2011 +0000
+++ b/gui/mplayer/mw.c	Thu Jun 16 11:52:44 2011 +0000
@@ -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"
diff -r fc1402410163 -r cceb74e98445 gui/wm/wskeys.h
--- a/gui/wm/wskeys.h	Thu Jun 16 11:45:47 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_GUI_WSKEYS_H
-#define MPLAYER_GUI_WSKEYS_H
-
-//Keys for multimedia keyboard
-
-#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_GUI_WSKEYS_H */
diff -r fc1402410163 -r cceb74e98445 libvo/wskeys.h
--- a/libvo/wskeys.h	Thu Jun 16 11:45:47 2011 +0000
+++ b/libvo/wskeys.h	Thu Jun 16 11:52:44 2011 +0000
@@ -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 */