diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libvo/x11_common.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index f2e659d3b6..b8446c94f9 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -526,6 +526,12 @@ static void vo_x11_putkey_ext(struct vo *vo, int keysym) struct mp_fifo *f = vo->key_fifo; switch (keysym) { + case XF86XK_MenuKB: + mplayer_put_key(f, KEY_MENU); + break; + case XF86XK_AudioPlay: + mplayer_put_key(f, KEY_PLAY); + break; case XF86XK_AudioPause: mplayer_put_key(f, KEY_PAUSE); break; @@ -538,6 +544,9 @@ static void vo_x11_putkey_ext(struct vo *vo, int keysym) case XF86XK_AudioNext: mplayer_put_key(f, KEY_NEXT); break; + case XF86XK_AudioMute: + mplayer_put_key(f, KEY_MUTE); + break; case XF86XK_AudioLowerVolume: mplayer_put_key(f, KEY_VOLUME_DOWN); break; |