summaryrefslogtreecommitdiffstats
path: root/input/input.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-15 10:25:43 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-15 10:25:43 +0000
commit3567bcac061c92b3ff9e52c0cfaf4ec8c08d9b56 (patch)
tree7f3203ef2764db1046db94be9619f4cd02f64331 /input/input.c
parent33eb8d1903f5f1846a55da274dc7e0bcb3a25590 (diff)
downloadmpv-3567bcac061c92b3ff9e52c0cfaf4ec8c08d9b56.tar.bz2
mpv-3567bcac061c92b3ff9e52c0cfaf4ec8c08d9b56.tar.xz
When compiled with gui, bind ESC to gui_stop so that s is free for screenshot.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16493 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input/input.c')
-rw-r--r--input/input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c
index e37decaeca..ba01509b31 100644
--- a/input/input.c
+++ b/input/input.c
@@ -281,8 +281,8 @@ static mp_cmd_bind_t def_cmd_binds[] = {
{ { '}', 0 }, "speed_mult 2.0" },
{ { KEY_BACKSPACE, 0 }, "speed_set 1.0" },
{ { 'q', 0 }, "quit" },
- { { KEY_ESC, 0 }, "quit" },
#ifndef HAVE_NEW_GUI
+ { { KEY_ESC, 0 }, "quit" },
{ { 'p', 0 }, "pause" },
#endif
{ { ' ', 0 }, "pause" },
@@ -336,7 +336,7 @@ static mp_cmd_bind_t def_cmd_binds[] = {
{ { 'l', 0 }, "gui_loadfile" },
{ { 't', 0 }, "gui_loadsubtitle" },
{ { KEY_ENTER, 0 }, "gui_play" },
- { { 's', 0 }, "gui_stop" },
+ { { KEY_ESC, 0 }, "gui_stop" },
{ { 'p', 0 }, "gui_playlist" },
{ { 'r', 0 }, "gui_preferences" },
{ { 'c', 0 }, "gui_skinbrowser" },