From e4bc563fd2dcff1059624efb7b948b2886a382ab Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 2 Jul 2017 16:26:41 +0200 Subject: options: change everything again Fucking bullshit. --- DOCS/interface-changes.rst | 12 +++++++----- DOCS/man/mpv.rst | 9 +++++---- DOCS/man/options.rst | 43 +++++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 29 deletions(-) (limited to 'DOCS') diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 9bdc251eaf..1d0f89a09e 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -40,12 +40,14 @@ Interface changes - the deprecated handling of setting "no-" options via client API is dropped - the following options change to append-by-default (and possibly separator): --script - --audio-file-paths - --sub-paths also, the following options are deprecated: - --audio-file-paths => --audio-file-path - --sub-paths => --sub-file-path - --opengl-shaders => --opengl-shader + --sub-paths => --sub-file-paths + the following options are deprecated for setting via API: + "script" (use "scripts") + "sub-file" (use "sub-files") + "audio-file" (use "audio-files") + "external-file" (use "external-files") + (the compatibility hacks for this will be removed after this release) - remove property `vo-performance`, and add `vo-passes` as a more general replacement --- mpv 0.25.0 --- diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index 9befe435da..fc36b7246c 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -429,8 +429,8 @@ Options for filenames do not use ``,`` as separator, but ``:`` (Unix) or ``;`` ============= =============================================== Suffix Meaning ============= =============================================== --add Append 1 or more items --add-str Append single item (avoids need for escaping) +-add Append 1 or more items (may become alias for -append) +-append Append single item (avoids need for escaping) -clr Clear the option -del Delete an existing item by integer index -pre Prepend 1 or more items @@ -442,8 +442,9 @@ this is strongly discouraged and deprecated, except for ``-set``. Without suffix, the action taken is normally ``-set``. -Some options (like ``--sub-file``, ``--audio-file``, ``--opengl-shader``) append -one file per option use. Their default action is ``-add-str``. +Some options (like ``--sub-file``, ``--audio-file``, ``--opengl-shader``) are +aliases for the proper option with ``-append`` action. For example, +``--sub-file`` is an alias for ``--sub-files-append``. Playing DVDs ------------ diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index c1fc4d96dc..a7ec35b3ae 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -67,7 +67,7 @@ Track Selection stream index is relatively arbitrary, but useful when interacting with other software using FFmpeg (consider ``ffprobe``). - Note that with external tracks (added with ``--sub-file`` and similar + Note that with external tracks (added with ``--sub-files`` and similar options), there will be streams with duplicate IDs. In this case, the first stream in order is selected. @@ -1362,13 +1362,16 @@ Audio This option has no influence on files with normal video tracks. -``--audio-file=`` - Play audio from an external file while viewing a video. Each use of this - option will add a new audio track. The details are similar to how - ``--sub-file`` works. +``--audio-files=`` + Play audio from an external file while viewing a video. This is a list option. See `List Options`_ for details. +``--audio-file=`` + CLI/config file only alias for ``--audio-files-append``. Each use of this + option will add a new audio track. The details are similar to how + ``--sub-file`` works. + ``--audio-format=`` Select the sample format used for output from the audio filter layer to the sound card. The values that ```` can adopt are listed below in @@ -1439,10 +1442,7 @@ Audio directories. ``--audio-file-paths=`` - Deprecated, use ``--audio-file-path``. - -``--audio-file-path=path1>`` - Equivalent to ``--sub-file-path`` option, but for auto-loaded audio files. + Equivalent to ``--sub-file-paths`` option, but for auto-loaded audio files. ``--audio-client-name=`` The application name the player reports to the audio API. Can be useful @@ -1505,7 +1505,7 @@ Subtitles ``--sub-delay=`` Delays subtitles by ```` seconds. Can be negative. -``--sub-file=subtitlefile`` +``--sub-files=`` Add a subtitle file to the list of external subtitles. If you use ``--sub-file`` only once, this subtitle file is displayed by @@ -1861,9 +1861,9 @@ Subtitles Never applied to text subtitles. ``--sub-paths=`` - Deprecated, use ``--sub-file-path``. + Deprecated, use ``--sub-file-paths``. -``--sub-file-path=path`` +``--sub-file-paths=`` Specify extra directories to search for subtitles matching the video. Multiple directories can be separated by ":" (";" on Windows). Paths can be relative or absolute. Relative paths are interpreted relative @@ -1874,7 +1874,7 @@ Subtitles .. admonition:: Example Assuming that ``/path/to/video/video.avi`` is played and - ``--sub-file-path=sub --sub-file-path=subtitles`` is specified, mpv + ``--sub-file-paths=sub:subtitles`` is specified, mpv searches for subtitle files in these directories: - ``/path/to/video/`` @@ -4167,7 +4167,7 @@ The following video options are currently all specific to ``--vo=opengl`` and results, as can missing or incorrect display FPS information (see ``--display-fps``). -``--opengl-shader=`` +``--opengl-shaders=`` Custom GLSL hooks. These are a flexible way to add custom fragment shaders, which can be injected at almost arbitrary points in the rendering pipeline, and access all previous intermediate textures. Each use of the option will @@ -4333,9 +4333,8 @@ The following video options are currently all specific to ``--vo=opengl`` and pass. When overwriting a texture marked ``fixed``, the WIDTH, HEIGHT and OFFSET must be left at their default values. -``--opengl-shaders=`` - Deprecated option for ``--opengl-shader``. Command line parsing behaves - slightly diffent. ``--opengl-shader-set`` gives exactly the same behavior. +``--opengl-shader=`` + CLI/config file only alias for ``--opengl-shaders-append``. ``--deband`` Enable the debanding algorithm. This greatly reduces the amount of visible @@ -5010,24 +5009,28 @@ Miscellaneous for scripts which want to set a title, without overriding the user's setting in ``--title``. -``--external-file=`` +``--external-files=`` Load a file and add all of its tracks. This is useful to play different files together (for example audio from one file, video from another), or for advanced ``--lavfi-complex`` used (like playing two video files at the same time). - Unlike ``--sub-file`` and ``--audio-file``, this includes all tracks, and + Unlike ``--sub-files`` and ``--audio-files``, this includes all tracks, and does not cause default stream selection over the "proper" file. This makes it slightly less intrusive. This is a list option. See `List Options`_ for details. +``--external-file=`` + CLI/config file only alias for ``--external-files-append``. Each use of this + option will add a new external files. + ``--autoload-files=`` Automatically load/select external files (default: yes). If set to ``no``, then do not automatically load external files as specified by ``--sub-auto`` and ``--audio-file-auto``. If external files are forcibly - added (like with ``--sub-file``), they will not be auto-selected. + added (like with ``--sub-files``), they will not be auto-selected. This does not affect playlist expansion, redirection, or other loading of referenced files like with ordered chapters. -- cgit v1.2.3