diff options
| author | wm4 <wm4@nowhere> | 2012-09-24 21:57:43 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-12 10:10:32 +0200 |
| commit | 88849fd1d4056bc22305cc4433dc56360dd6d0e9 (patch) | |
| tree | d444c8533404a303a07e36c288474d7d927457f9 /etc | |
| parent | a441cd3eeb9291e20d5a8052d32ce8180b017763 (diff) | |
| download | mpv-88849fd1d4056bc22305cc4433dc56360dd6d0e9.tar.bz2 mpv-88849fd1d4056bc22305cc4433dc56360dd6d0e9.tar.xz | |
commands: add choice type to input commands
Allow using the choice type (as it used for command line) for arguments
of input commands. Change the magic integer arguments of some commands
(like seek) to use choices instead. The old numeric values are still
allowed (but only those which made sense before, not arbitrary
integers).
In order to do this, remove the input.c specific types (like
MP_CMD_ARG_INT) completely and specify commands using the m_option
types.
Also, add the special choice "-" to some arguments. It's supposed to
signify the default value, so arguments can be easily skipped. Maybe the
choice option should recognize this and not change the previous value,
but we'll leave this for later.
For now, leave compatibility integer values for all new choice
arguments, e.g. "0" maps to 0. We could let the choice option type do
this automatically, but we don't, because we want user input values and
internal mplayer values decoupled in general. The compatibility options
will be removed one day, too.
Also, remove optional args for strings - would require either annoying
additional code, or copying strings twice. It's not used, so remove it.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/input.conf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/etc/input.conf b/etc/input.conf index 257a4538c9..856ebba457 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -37,10 +37,10 @@ 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 +Shift+RIGHT seek 1 - exact +Shift+LEFT seek -1 - exact +Shift+UP seek 5 - exact +Shift+DOWN seek -5 - exact PGUP seek 600 PGDWN seek -600 + add audio-delay 0.100 # this changes audio/video sync @@ -57,7 +57,7 @@ p cycle pause # toggle pause/playback mode . frame_step # advance one frame and 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 show_text "${filename}" # display filename in osd @@ -100,10 +100,10 @@ TAB cycle program i edl_mark # for use with --edlout mode T cycle ontop # toggle video window ontop of other windows f cycle fullscreen # toggle fullscreen -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 +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 |