From cfd3d5b52003a23376d02fd6cc581f46289badd2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 5 Feb 2015 22:14:17 +0100 Subject: player: do not autoload audio with audio files, enable autoloading Autoload external audio files only if there's at least a video track (which is not coverart pseudo-video). Enable external audio file autoloading by default. Now that we actively avoid doing stupid things like loading an external audio file for an audio-only file, this should be fine. Additionally, don't autoload subtitles if a subtitle is played. Although you currently can't play subtitles without audio or video, it's disturbing and stupid that the player might load subtitle files with different extension and then fail. --- DOCS/man/options.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 852752e5ff..ad73b6ddcf 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -1041,11 +1041,11 @@ Audio ``--audio-file-auto=``, ``--no-audio-file-auto`` Load additional audio files matching the video filename. The parameter - specifies how external audio files are matched. This is disabled by + specifies how external audio files are matched. ``exact`` is enabled by default. - :no: Don't automatically load external audio files (default). - :exact: Load the media filename with audio file extension. + :no: Don't automatically load external audio files. + :exact: Load the media filename with audio file extension (default). :fuzzy: Load all audio files containing media filename. :all: Load all audio files in the current directory. -- cgit v1.2.3