diff options
| author |  gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-16 16:47:35 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-16 16:47:35 +0000 |
| commit | 7ecf1d87b00794980b05badda816b2fdf5c7c826 (patch) | |
| tree | 7d59b49b965290827d0923c17a72ed098f8dbf63 | |
| parent | 82d7a7a8f3e9d7ed1a4b3151a60887e963c979d5 (diff) | |
ENTER now quits after last file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5137 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/input.conf | 2 | ||||
| -rw-r--r-- | input/input.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/etc/input.conf b/etc/input.conf index 70340775cf..c9071910c3 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -17,7 +17,7 @@ PGDWN seek -600 + audio_delay -0.100 q quit ESC quit -ENTER pt_step 1 +ENTER pt_step 1 1 p pause SPACE pause HOME pt_up_step 1 diff --git a/input/input.c b/input/input.c index 6391dd1de5..ada02482ba 100644 --- a/input/input.c +++ b/input/input.c @@ -152,11 +152,11 @@ static mp_cmd_bind_t def_cmd_binds[] = { { { KEY_DOWN, 0 }, "seek -60" }, { { KEY_PAGE_UP, 0 }, "seek 600" }, { { KEY_PAGE_DOWN, 0 }, "seek -600" }, - { { '+', 0 }, "audio_delay 0.100" }, - { { '-', 0 }, "audio_delay -0.100" }, + { { '-', 0 }, "audio_delay 0.100" }, + { { '+', 0 }, "audio_delay -0.100" }, { { 'q', 0 }, "quit" }, { { KEY_ESC, 0 }, "quit" }, - { { KEY_ENTER, 0 }, "quit" }, + { { KEY_ENTER, 0 }, "pt_step 1 1" }, #ifndef HAVE_NEW_GUI { { 'p', 0 }, "pause" }, #endif @@ -177,7 +177,6 @@ static mp_cmd_bind_t def_cmd_binds[] = { { { '/', 0 }, "volume -1" }, { { '0', 0 }, "volume 1" }, { { '*', 0 }, "volume 1" }, - { { 'm', 0 }, "use_master" }, { { '1', 0 }, "contrast -1" }, { { '2', 0 }, "contrast 1" }, { { '3', 0 }, "brightness -1" }, |