Mercurial > mplayer.hg
changeset 36118:2d29160e0957
input: add an option to set the default pausing mode.
| author | cigaes |
|---|---|
| date | Fri, 03 May 2013 18:52:54 +0000 |
| parents | 302c864b1d26 |
| children | 882f0da023b9 |
| files | DOCS/man/en/mplayer.1 cfg-mplayer.h input/input.c input/input.h |
| diffstat | 4 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Fri May 03 13:20:27 2013 +0000 +++ b/DOCS/man/en/mplayer.1 Fri May 03 18:52:54 2013 +0000 @@ -1246,6 +1246,26 @@ wake up the process with similar accuracy when using normal timed sleep. . .TP +.B \-pausing <0\-3> (MPlayer only) +Specifies the default pausing behaviour of commands, i.e. whether MPlayer +will continue playback or stay paused after the command has finished. +See DOCS/tech/slave.txt for further details. +.PD 0 +.RSs +.IPs 0 +resume +.IPs 1 +pause (pausing) +.IPs 2 +keep the paused / playing status (pausing_keep) +.IPs 3 +toggle the paused / playing status (pausing_toggle) +.IPs 4 +pause without frame step (experimental) (pausing_keep_force) +.RE +.PD 1 +. +.TP .B \-playing\-msg <string> Print out a string before starting playback. The following expansions are supported:
--- a/cfg-mplayer.h Fri May 03 13:20:27 2013 +0000 +++ b/cfg-mplayer.h Fri May 03 18:52:54 2013 +0000 @@ -339,6 +339,7 @@ {"mouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nomouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"doubleclick-time", &doubleclick_time, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, + {"pausing", &pausing_default, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, #ifdef CONFIG_TV {"tvscan", tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #else
--- a/input/input.c Fri May 03 13:20:27 2013 +0000 +++ b/input/input.c Fri May 03 18:52:54 2013 +0000 @@ -577,6 +577,8 @@ int async_quit_request; +int pausing_default = 0; + static mp_input_fd_t key_fds[MP_MAX_KEY_FD]; static unsigned int num_key_fd = 0; static mp_input_fd_t cmd_fds[MP_MAX_CMD_FD]; @@ -836,7 +838,7 @@ case MP_CMD_SET_MOUSE_POS: pausing = 4; break; default: - pausing = 0; break; + pausing = pausing_default; break; } } cmd->pausing = pausing;