vdpau: Switch from deprecated XKeycodeToKeysym() to XkbKeycodeToKeysym()

Conflicts:

	sys/vdpau/gstvdpsink.c
This commit is contained in:
Sebastian Dröge 2012-04-24 11:02:26 +02:00
parent 07ddc9d8cd
commit a5495fb475

View file

@ -30,6 +30,8 @@
#include <gst/interfaces/navigation.h> #include <gst/interfaces/navigation.h>
#include <gst/interfaces/xoverlay.h> #include <gst/interfaces/xoverlay.h>
#include <X11/XKBlib.h>
/* Debugging category */ /* Debugging category */
#include <gst/gstinfo.h> #include <gst/gstinfo.h>
@ -387,7 +389,8 @@ gst_vdp_sink_handle_xevents (VdpSink * vdp_sink)
e.xkey.keycode, e.xkey.x, e.xkey.x); e.xkey.keycode, e.xkey.x, e.xkey.x);
g_mutex_lock (vdp_sink->x_lock); g_mutex_lock (vdp_sink->x_lock);
keysym = keysym =
XKeycodeToKeysym (vdp_sink->device->display, e.xkey.keycode, 0); XkbKeycodeToKeysym (vdp_sink->device->display, e.xkey.keycode, 0,
0);
g_mutex_unlock (vdp_sink->x_lock); g_mutex_unlock (vdp_sink->x_lock);
if (keysym != NoSymbol) { if (keysym != NoSymbol) {
char *key_str = NULL; char *key_str = NULL;