summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-12 10:17:55 +0200
committerwm4 <wm4@nowhere>2012-10-12 11:53:53 +0200
commit85d185441acf4691c830db2f40235ac927410d45 (patch)
tree211177793cd5d6b399346be661af8e7528f0f411 /etc
parent65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff)
parente1b15dee4c250bf6509594e241eb2856c8d21e0f (diff)
downloadmpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2
mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz
Merge branch 'input_changes' into master
Conflicts: DOCS/man/en/vo.rst etc/input.conf input/input.c m_property.c
Diffstat (limited to 'etc')
-rw-r--r--etc/input.conf162
1 files changed, 80 insertions, 82 deletions
diff --git a/etc/input.conf b/etc/input.conf
index 0dec4fa4b0..f9906b23a4 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -11,27 +11,25 @@
#
# Note that merely removing default key bindings from this file won't remove
# the default bindings mpv was compiled with, unless
-# --input=nodefault-bindings
+# --input=no-default-bindings
# is specified.
#
# Lines starting with # are comments. Use SHARP to assign the # key.
#
-# Some characters need to be escaped. In particular, if you want to display
-# a '\' character as part of an osd_show_property_text OSD message, you have to
-# escape 2 times:
-# key osd_show_property_text "This is a single backslash: \\\\!"
+# Strings need to be quoted and escaped:
+# KEY show_text "This is a single backslash: \\ and a quote: \" !"
#
# 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 certain
# output drivers (not in output windows of other drivers or in a terminal).
-MOUSE_BTN0_DBL vo_fullscreen # toggle fullscreen on/off
-MOUSE_BTN2 pause # toggle pause on/off
+MOUSE_BTN0_DBL cycle fullscreen # toggle fullscreen on/off
+MOUSE_BTN2 cycle pause # toggle pause on/off
MOUSE_BTN3 seek 10
MOUSE_BTN4 seek -10
-MOUSE_BTN5 volume 1
-MOUSE_BTN6 volume -1
+MOUSE_BTN5 add volume 1
+MOUSE_BTN6 add volume -1
# Seek units are in seconds, but note that these are limited by keyframes
RIGHT seek 10
@@ -39,95 +37,95 @@ LEFT seek -10
UP seek 60
DOWN 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+UP seek 5 0 1
-Shift+DOWN seek -5 0 1
+# Don't show them on the OSD (no-osd).
+Shift+RIGHT no-osd seek 1 - exact
+Shift+LEFT no-osd seek -1 - exact
+Shift+UP no-osd seek 5 - exact
+Shift+DOWN no-osd seek -5 - exact
PGUP seek 600
PGDWN seek -600
-+ audio_delay 0.100 # this changes audio/video sync
-- audio_delay -0.100
++ add audio-delay 0.100 # this changes audio/video sync
+- add audio-delay -0.100
[ speed_mult 0.9091 # scale playback speed
] speed_mult 1.1
{ speed_mult 0.5
} speed_mult 2.0
-BS speed_set 1.0 # reset speed to normal
+BS set speed 1.0 # reset speed to normal
q quit
q {encode} quit
ESC quit
-p pause # toggle pause/playback mode
+p cycle pause # toggle pause/playback mode
. frame_step # advance one frame and pause
-SPACE pause
+SPACE cycle pause
> playlist_next # skip to next file
-ENTER playlist_next 1 # skip to next file or quit
+ENTER playlist_next force # skip to next file or quit
< playlist_prev # skip to previous file
o osd # cycle through OSD mode
-I osd_show_property_text "${filename}" # display filename in osd
-P osd_show_progression
-z sub_delay -0.1 # subtract 100 ms delay from subs
-x sub_delay +0.1 # add
+I show_text "${filename}" # display filename in osd
+P show_progress
+z add sub-delay -0.1 # subtract 100 ms delay from subs
+x add sub-delay +0.1 # add
g sub_step -1 # immediately display next subtitle
y sub_step +1 # previous
-9 volume -1
-/ volume -1
-0 volume 1
-* volume 1
-( balance -0.1 # adjust audio balance in favor of left
-) balance 0.1 # right
-m mute
-1 contrast -1
-2 contrast 1
-3 brightness -1
-4 brightness 1
-5 hue -1
-6 hue 1
-7 saturation -1
-8 saturation 1
-d frame_drop # cycle through framedrop modes
+9 add volume -1
+/ add volume -1
+0 add volume 1
+* add volume 1
+( add balance -0.1 # adjust audio balance in favor of left
+) add balance 0.1 # right
+m cycle mute
+1 add contrast -1
+2 add contrast 1
+3 add brightness -1
+4 add brightness 1
+5 add hue -1
+6 add hue 1
+7 add saturation -1
+8 add saturation 1
+d cycle framedrop # cycle through framedrop modes
# toggle deinterlacer; requires either vdpau output, -vf yadif or kerndeint
-D step_property_osd deinterlace
-c step_property_osd colormatrix
+D cycle deinterlace
+c cycle colormatrix
# Next 3 currently only work with --no-ass
-r sub_pos -1 # move subtitles up
-t sub_pos +1 # down
-v sub_visibility
+r add sub-pos -1 # move subtitles up
+t add sub-pos +1 # down
+v cycle sub-visibility
# stretch SSA/ASS subtitles with anamorphic videos to match historical
-V step_property_osd ass_vsfilter_aspect_compat
-j sub_select # cycle through subtitles
-J sub_select -3 # ...backwards
-F forced_subs_only
-SHARP switch_audio # switch audio streams
-_ step_property switch_video
-TAB step_property switch_program
+V cycle ass-vsfilter-aspect-compat
+j cycle sub # cycle through subtitles
+J cycle sub down # ...backwards
+F cycle sub-forced-only
+SHARP cycle audio # switch audio streams
+_ cycle video
+TAB cycle program
i edl_mark # for use with --edlout mode
-T vo_ontop # toggle video window ontop of other windows
-f vo_fullscreen # toggle fullscreen
-C step_property_osd capturing
-s screenshot 0 # take a png screenshot
-S screenshot 1 # ...on every frame
-Alt+s screenshot 0 1 # take a screenshot of window contents
-Alt+S screenshot 1 1 # ...on every frame
-w panscan -0.1 # zoom out with -panscan 0 -fs
-e panscan +0.1 # in
+T cycle ontop # toggle video window ontop of other windows
+f cycle fullscreen # toggle fullscreen
+s screenshot # take a png screenshot
+S screenshot each-frame # ...on every frame
+Alt+s screenshot - window # take a screenshot of window contents
+Alt+S screenshot each-frame window # ...on every frame
+w add panscan -0.1 # zoom out with -panscan 0 -fs
+e add panscan +0.1 # in
POWER quit
-MENU osd
-PLAY pause
-PAUSE pause
-PLAYPAUSE pause
+MENU cycle osd
+PLAY cycle pause
+PAUSE cycle pause
+PLAYPAUSE cycle pause
STOP quit
FORWARD seek 60
REWIND seek -60
NEXT playlist_next
PREV playlist_prev
-VOLUME_UP volume 1
-VOLUME_DOWN volume -1
-MUTE mute
+VOLUME_UP add volume 1
+VOLUME_DOWN add volume -1
+MUTE cycle mute
CLOSE_WIN quit
CLOSE_WIN {encode} quit
-! seek_chapter -1 # skip to previous chapter
-@ seek_chapter 1 # next
-E step_property_osd edition # next edition
-A switch_angle 1
+! add chapter -1 # skip to previous chapter
+@ add chapter 1 # next
+E cycle edition # next edition
+A cycle angle
U stop
# TV
@@ -140,16 +138,16 @@ u tv_step_chanlist
# Apple Remote section
#
-AR_PLAY pause
+AR_PLAY cycle pause
AR_PLAY_HOLD quit
AR_NEXT seek 30
AR_NEXT_HOLD seek 120
AR_PREV seek -10
AR_PREV_HOLD seek -120
-AR_MENU osd
-AR_MENU_HOLD mute
-AR_VUP volume 1
-AR_VDOWN volume -1
+AR_MENU cycle osd
+AR_MENU_HOLD cycle mute
+AR_VUP add volume 1
+AR_VDOWN add volume -1
#
# Joystick section
@@ -161,15 +159,15 @@ JOY_AXIS0_PLUS seek 10
JOY_AXIS0_MINUS seek -10
JOY_AXIS1_MINUS seek 60
JOY_AXIS1_PLUS seek -60
-JOY_BTN0 pause
-JOY_BTN1 osd
-JOY_BTN2 volume 1
-JOY_BTN3 volume -1
+JOY_BTN0 cycle pause
+JOY_BTN1 cycle osd
+JOY_BTN2 add volume 1
+JOY_BTN3 add volume -1
#
# Not assigned by default
# (not an exhaustive list of unbound commands)
#
-#? sub_scale +0.1 # increase subtitle font size
-#? sub_scale -0.1 # decrease subtitle font size
+#? add sub-scale +0.1 # increase subtitle font size
+#? add sub-scale -0.1 # decrease subtitle font size