Add media key to X11 vouts. Patch by loox.thefuture

diff --git a/THANKS b/THANKS
index 84210d80ab44e4fc9bf03f48c14e0d492ecf8937..c8b90c442ad03046444de15088d30122a9191ae5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -103,6 +103,7 @@ K. Staring <qdk at quickdekay dot net> - RTSP rewind and fast-forward support
 Laurent Jonqueres <laurent_jonqueres at yahoo.fr> - Occitan localization
 Laurent Mutricy <laurent.mutricy at ecl2005 dot ec-lyon dot fr> - HTTP interface fixes
 Leo Spalteholz <leo dot spalteholz at gmail dot com> - Qt interface design
+Loox Thefuture <loox.thefuture at gmail dot com> - Media key in X11 vout
 Lorena Gomes - Catalan translation
 Mahrazi Mohd Kamal <mahrazi at gmail.com> - Malay Translation
 Marc Nolette <nolette at videotron.ca> - PVR support in DirectShow input

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 4644dbf8e515dd0954d69308a0d02f372fcfbc17..ef9fc2b9b0faac7604398f453fb28ab551e7159f 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -57,6 +57,7 @@
 #include <X11/Xmd.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
+#include <X11/XF86keysym.h>
 #ifdef HAVE_SYS_SHM_H
 #   include <X11/extensions/XShm.h>
 #endif
@@ -3048,6 +3049,13 @@ static struct
 
     { XK_Insert, KEY_INSERT },
     { XK_Delete, KEY_DELETE },
+    { XF86XK_AudioNext, KEY_MEDIA_NEXT_TRACK},
+    { XF86XK_AudioPrev, KEY_MEDIA_PREV_TRACK},
+    { XF86XK_AudioMute, KEY_VOLUME_MUTE },
+    { XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN },
+    { XF86XK_AudioRaiseVolume, KEY_VOLUME_UP },
+    { XF86XK_AudioPlay, KEY_MEDIA_PLAY_PAUSE },
+    { XF86XK_AudioPause, KEY_MEDIA_PLAY_PAUSE },
 
     { 0, 0 }
 };