summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-20 19:17:43 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-20 19:17:43 +0200
commit0afb326035e66663a90c4609f21560ce772e9718 (patch)
tree07f443e2bd39745ac7430cff9534529958be9c53 /etc
parent4a26b4c024498c9b1be4723121d86e0c2b386ed2 (diff)
parent5bb2f9787f557bd91d5eb9021238ed7b131d5fa9 (diff)
downloadmpv-0afb326035e66663a90c4609f21560ce772e9718.tar.bz2
mpv-0afb326035e66663a90c4609f21560ce772e9718.tar.xz
Merge branch 'hr-seek'
* hr-seek: input: add default keybindings Shift+[arrow] for small exact seeks input: support bindings with modifier keys for X input core: audio: make ogg missing audio timing workaround more complex core: add support for precise non-keyframe-limited seeks core: add struct for queued seek info commands: add generic option -> property wrapper options: add "choice" option type, use for -pts-association-mode core: remove looping in update_video(), modify command handling a bit core: seek: use accurate seek mode with audio-only files core: avoid using sh_video->pts as "current pts" libvo: register X11 connection fd in input event system core: timing: add special handling of long frame intervals core: move central play loop to a separate function Conflicts: DOCS/tech/slave.txt
Diffstat (limited to 'etc')
-rw-r--r--etc/input.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/input.conf b/etc/input.conf
index 0bcfdec9f7..74373d7ffe 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -10,11 +10,20 @@
## If you wish to unbind a key, use key ignore.
## e.g. ENTER ignore
##
+## You can use modifier-key combinations like Shift+Left or Ctrl+Alt+x with
+## modifiers Shift, Ctrl, Alt and Meta, but note that currently reading
+## key combinations is only supported through the video windows of X-based
+## output drivers (not in output windows of other drivers or in a terminal).
RIGHT seek +10
LEFT seek -10
DOWN seek -60
UP seek +60
+# Do smaller, always exact (non-keyframe-limited), seeks with shift.
+Shift+Right seek +1 0 1
+Shift+Left seek -1 0 1
+Shift+Down seek -5 0 1
+Shift+Up seek +5 0 1
PGUP seek 600
PGDWN seek -600
m mute