Mercurial > mplayer.hg
changeset 33537:cceb74e98445
Move key definitions for multimedia keyboards to libvo/wskeys.h,
making wm/wskeys.h finally obsolete.
| author | ib |
|---|---|
| date | Thu, 16 Jun 2011 11:52:44 +0000 |
| parents | fc1402410163 |
| children | 64e43eb13ebf |
| files | gui/mplayer/mw.c gui/wm/wskeys.h libvo/wskeys.h |
| diffstat | 3 files changed, 12 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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 */
--- 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 */