diff options
| -rw-r--r-- | DOCS/man/en/changes.rst | 5 | ||||
| -rw-r--r-- | DOCS/man/en/input.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/en/options.rst | 100 | ||||
| -rw-r--r-- | input/input.c | 14 | ||||
| -rw-r--r-- | options/options.c | 6 | ||||
| -rw-r--r-- | options/options.h | 2 | ||||
| -rw-r--r-- | options/parse_commandline.c | 2 |
7 files changed, 68 insertions, 63 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 860b5194da..af890a4178 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -161,9 +161,14 @@ Command Line Switches ``-hardframedrop`` ``--framedrop=hard`` ``-lavdopts ...`` ``--vd-lavc-...`` ``-lavfdopts`` ``--demuxer-lavf-...`` + ``-lircconf`` ``--input-lirc-conf`` ``-loop 0`` ``--loop=inf`` ``-mixer-channel`` AO suboptions (``alsa``, ``oss``) ``-mixer`` AO suboptions (``alsa``, ``oss``) + ``-mouse-movements`` ``--input-cursor`` + ``-noar`` ``--no-input-appleremote`` + ``-noconsolecontrols`` ``--no-input-terminal`` + ``-nojoystick`` ``--no-input-joystick`` ``-nosound`` ``--no-audio`` ``-osdlevel`` ``--osd-level`` ``-panscanrange`` ``--video-zoom``, ``--video-pan-x/y`` diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index 52ba8168f3..cb2361f27e 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -33,7 +33,7 @@ General Input Command Syntax Note that by default, the right Alt key can be used to create special characters, and thus does not register as a modifier. The option -``--no-right-alt-gr`` changes this behavior. +``--no-input-right-alt-gr`` changes this behavior. Newlines always start a new binding. ``#`` starts a comment (outside of quoted string arguments). To bind commands to the ``#`` key, ``SHARP`` can be used. diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index ecb5dc4dc1..968cf014d9 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -97,9 +97,6 @@ OPTIONS configuration files specifying a list of fallbacks may make sense. See `AUDIO OUTPUT DRIVERS`_ for details and descriptions of available drivers. -``--ar``, ``--no-ar`` - Enable/disable AppleIR remote support. Enabled by default. - ``--aspect=<ratio>`` Override movie aspect ratio, in case aspect information is incorrect or missing in the file being played. See also ``--no-aspect``. @@ -575,15 +572,6 @@ OPTIONS Note that the ``--no-config`` option takes precedence over this option. -``--consolecontrols``, ``--no-consolecontrols`` - ``--no-consolecontrols`` prevents the player from reading key events from - standard input. Useful when reading data from standard input. This is - automatically enabled when ``-`` is found on the command line. There are - situations where you have to set it manually, e.g. if you open - ``/dev/stdin`` (or the equivalent on your system), use stdin in a playlist - or intend to read from stdin later on via the loadfile or loadlist slave - commands. - ``--contrast=<-100-100>`` Adjust the contrast of the video signal (default: 0). Not supported by all video output drivers. @@ -1225,23 +1213,21 @@ OPTIONS Specify input configuration file other than the default ``~/.mpv/input.conf``. -``--input-ar-delay`` - Delay in milliseconds before we start to autorepeat a key (0 to disable). - -``--input-ar-rate`` - Number of key presses to generate per second on autorepeat. - ``--no-input-default-bindings`` Disable mpv default (builtin) key bindings. -``--input-keylist`` - Prints all keys that can be bound to commands. - ``--input-cmdlist`` Prints all commands that can be bound to keys. -``--input-js-dev`` - Specifies the joystick device to use (default: ``/dev/input/js0``). +``--input-keylist`` + Prints all keys that can be bound to commands. + +``--input-test`` + Input test mode. Instead of executing commands on key presses, mpv + will show the keys and the bound commands on the OSD. Has to be used + with a dummy video, and the normal ways to quit the player will not + work (key bindings that normally quit will be shown on OSD only, just + like any other binding). See `INPUT.CONF`_. ``--input-file=<filename>`` Read commands from the given file. Mostly useful with a FIFO. @@ -1252,16 +1238,50 @@ OPTIONS When the given file is a FIFO mpv opens both ends, so you can do several `echo "seek 10" > mp_pipe` and the pipe will stay valid. -``--input-test`` - Input test mode. Instead of executing commands on key presses, mpv - will show the keys and the bound commands on the OSD. Has to be used - with a dummy video, and the normal ways to quit the player will not - work (key bindings that normally quit will be shown on OSD only, just - like any other binding). See `INPUT.CONF`_. +``--input-terminal``, ``--no-input-terminal`` + ``--no-input-terminal`` prevents the player from reading key events from + standard input. Useful when reading data from standard input. This is + automatically enabled when ``-`` is found on the command line. There are + situations where you have to set it manually, e.g. if you open + ``/dev/stdin`` (or the equivalent on your system), use stdin in a playlist + or intend to read from stdin later on via the loadfile or loadlist slave + commands. + +``--input-appleremote``, ``--no-input-appleremote`` + Enable/disable AppleIR remote support. Enabled by default. + +``--input-ar-delay`` + Delay in milliseconds before we start to autorepeat a key (0 to disable). + +``--input-ar-rate`` + Number of key presses to generate per second on autorepeat. + +``--input-cursor``, ``--no-input-cursor`` + Permit mpv to receive pointer events reported by the video output + driver. Necessary to select the buttons in DVD menus. Supported for + X11-based VOs (x11, xv, etc) and the gl, direct3d and corevideo VOs. -``--joystick``, ``--no-joystick`` +``--input-joystick``, ``--no-input-joystick`` Enable/disable joystick support. Disabled by default. +``--input-js-dev`` + Specifies the joystick device to use (default: ``/dev/input/js0``). + +``--input-lirc``, ``--no-input-lirc`` + Enable/disable LIRC support. Enabled by default. + +``--input-lirc-conf=<filename>`` + (LIRC only) + Specifies a configuration file for LIRC (default: ``~/.lircrc``). + +``--input-media-keys``, ``--no-input-media-keys`` + OSX only: Enabled by default. Enables/disable media keys support. + +``--input-right-alt-gr``, ``--no-input-right-alt-gr`` + (Cocoa and Windows only) + Use the right Alt key as Alt Gr to produce special characters. If disabled, + count the right Alt as an Alt modifier key. Enabled by default. + ``--no-keepaspect``, ``--keepaspect`` ``--no-keepaspect`` will always stretch the video to window size, and will disable the window manager hints that force the window aspect ratio. @@ -1292,13 +1312,6 @@ OPTIONS Stop after a given time relative to the start time. See ``--start`` for valid option values and examples. -``--lirc``, ``--no-lirc`` - Enable/disable LIRC support. Enabled by default. - -``--lircconf=<filename>`` - (LIRC only) - Specifies a configuration file for LIRC (default: ``~/.lircrc``). - ``--list-options`` Prints all available options. @@ -1349,9 +1362,6 @@ OPTIONS ``--mc=<seconds/frame>`` Maximum A-V sync correction per frame (in seconds) -``--media-keys``, ``--no-media-keys`` - OSX only: Enabled by default. Enables/disable media keys support. - ``--merge-files`` Pretend that all files passed to mpv are concatenated into a single, big file. This uses timeline/EDL support internally. Note that this won't work @@ -1386,11 +1396,6 @@ OPTIONS 1). A value of 1 means square pixels (correct for (almost?) all LCDs). See also ``--monitoraspect`` and ``--aspect``. -``--mouse-movements``, ``--no-mouse-movements`` - Permit mpv to receive pointer events reported by the video output - driver. Necessary to select the buttons in DVD menus. Supported for - X11-based VOs (x11, xv, etc) and the gl, direct3d and corevideo VOs. - ``--no-msgcolor`` Disable colorful console output on terminals. @@ -1876,11 +1881,6 @@ OPTIONS - ``--reset-on-next-file=all`` Try to reset all settings that were changed during playback. -``--right-alt-gr``, ``--no-right-alt-gr`` - (Cocoa and Windows only) - Use the right Alt key as Alt Gr to produce special characters. If disabled, - count the right Alt as an Alt modifier key. Enabled by default. - ``--rtsp-transport=<lavf|udp|tcp|http>`` Select RTSP transport method (default: tcp). This selects the underlying network transport when playing ``rtsp://...`` URLs. The value ``lavf`` diff --git a/input/input.c b/input/input.c index fee469b9d4..ed9a15c017 100644 --- a/input/input.c +++ b/input/input.c @@ -208,15 +208,15 @@ static const m_option_t input_config[] = { const m_option_t mp_input_opts[] = { { "input", (void *)&input_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, OPT_INTRANGE("doubleclick-time", input.doubleclick_time, 0, 0, 1000), - OPT_FLAG("joystick", input.use_joystick, CONF_GLOBAL), - OPT_FLAG("lirc", input.use_lirc, CONF_GLOBAL), - OPT_FLAG("right-alt-gr", input.use_alt_gr, CONF_GLOBAL), + OPT_FLAG("input-joystick", input.use_joystick, CONF_GLOBAL), + OPT_FLAG("input-lirc", input.use_lirc, CONF_GLOBAL), + OPT_FLAG("input-right-alt-gr", input.use_alt_gr, CONF_GLOBAL), #if HAVE_LIRC - OPT_STRING("lircconf", input.lirc_configfile, CONF_GLOBAL), + OPT_STRING("input-lirc-conf", input.lirc_configfile, CONF_GLOBAL), #endif #if HAVE_COCOA - OPT_FLAG("ar", input.use_ar, CONF_GLOBAL), - OPT_FLAG("media-keys", input.use_media_keys, CONF_GLOBAL), + OPT_FLAG("input-appleremote", input.use_appleremote, CONF_GLOBAL), + OPT_FLAG("input-media-keys", input.use_media_keys, CONF_GLOBAL), #endif { NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -1537,7 +1537,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global) } #if HAVE_COCOA - if (input_conf->use_ar) { + if (input_conf->use_appleremote) { cocoa_init_apple_remote(); ictx->using_ar = true; } diff --git a/options/options.c b/options/options.c index 646ebc490f..6a7aab43bd 100644 --- a/options/options.c +++ b/options/options.c @@ -602,8 +602,8 @@ const m_option_t mp_opts[] = { OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL), OPT_FLAG("idle", player_idle_mode, M_OPT_GLOBAL), OPT_INTRANGE("key-fifo-size", input.key_fifo_size, CONF_GLOBAL, 2, 65000), - OPT_FLAG("consolecontrols", consolecontrols, CONF_GLOBAL), - OPT_FLAG("mouse-movements", vo.enable_mouse_movements, CONF_GLOBAL), + OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL), + OPT_FLAG("input-cursor", vo.enable_mouse_movements, CONF_GLOBAL), #if HAVE_TV {"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* HAVE_TV */ @@ -764,7 +764,7 @@ const struct MPOpts mp_default_opts = { .use_lirc = 1, .use_alt_gr = 1, #if HAVE_COCOA - .use_ar = 1, + .use_appleremote = 1, .use_media_keys = 1, #endif .default_bindings = 1, diff --git a/options/options.h b/options/options.h index 650ee21f5e..551b5911b6 100644 --- a/options/options.h +++ b/options/options.h @@ -279,7 +279,7 @@ typedef struct MPOpts { char *lirc_configfile; int use_lircc; int use_alt_gr; - int use_ar; + int use_appleremote; int use_media_keys; int default_bindings; int test; diff --git a/options/parse_commandline.c b/options/parse_commandline.c index 93ab47299f..e1c84b9f27 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -262,7 +262,7 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, // Lock stdin if it will be used as input if (bstrcmp0(file, "-") == 0) - m_config_set_option0(config, "consolecontrols", "no"); + m_config_set_option0(config, "input-console", "no"); } } |