player: add always to --subs-fallback-forced

In general, forced tracks should only be shown if they match the
language of the audio. However some people do want them no matter what,
so add an always option to this so such tracks are always selected.

2 files changed, 4 insertions, 3 deletions

diff --git a/options/options.c b/options/options.c
index 14fb4039c0..ae51a010ac 100644
--- a/options/options.c
+++ b/options/options.c
@@ -524,7 +524,8 @@ static const m_option_t mp_opts[] = {
     {"subs-with-matching-audio", OPT_BOOL(subs_with_matching_audio)},
     {"subs-match-os-language", OPT_BOOL(subs_match_os_language)},
     {"subs-fallback", OPT_CHOICE(subs_fallback, {"no", 0}, {"default", 1}, {"yes", 2})},
-    {"subs-fallback-forced", OPT_BOOL(subs_fallback_forced)},
+    {"subs-fallback-forced", OPT_CHOICE(subs_fallback_forced, {"no", 0},
+        {"yes", 1}, {"always", 2})},
 
     {"lavfi-complex", OPT_STRING(lavfi_complex), .flags = UPDATE_LAVFI_COMPLEX},
 
@@ -1047,7 +1048,7 @@ static const struct MPOpts mp_default_opts = {
     .subs_with_matching_audio = true,
     .subs_match_os_language = true,
     .subs_fallback = 1,
-    .subs_fallback_forced = true,
+    .subs_fallback_forced = 1,
     .audio_display = 1,
     .audio_output_format = 0,  // AF_FORMAT_UNKNOWN
     .playback_speed = 1.,
diff --git a/options/options.h b/options/options.h
index 52547183a2..a2fca90432 100644
--- a/options/options.h
+++ b/options/options.h
@@ -270,7 +270,7 @@ typedef struct MPOpts {
     bool subs_with_matching_audio;
     bool subs_match_os_language;
     int subs_fallback;
-    bool subs_fallback_forced;
+    int subs_fallback_forced;
     int audio_display;
     char **display_tags;