From 94441ed13963356fa25f7e52a12e36387220ebba Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 4 May 2014 10:31:24 +0200
Subject: options: merge ---sub-auto-match with --sub-auto

There's no reason why these should be separate.
---
 options/options.c | 7 +++----
 options/options.h | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index 21a2f4014d..e589bf8d61 100644
--- a/options/options.c
+++ b/options/options.c
@@ -407,13 +407,12 @@ const m_option_t mp_opts[] = {
     OPT_FLOAT("sub-delay", sub_delay, 0),
     OPT_FLOAT("sub-fps", sub_fps, 0),
     OPT_FLOAT("sub-speed", sub_speed, 0),
-    OPT_FLAG("sub-auto", sub_auto, 0),
     OPT_FLAG("sub-visibility", sub_visibility, 0),
     OPT_FLAG("sub-forced-only", forced_subs_only, 0),
     OPT_FLAG("stretch-dvd-subs", stretch_dvd_subs, 0),
     OPT_FLAG_CONSTANTS("sub-fix-timing", suboverlap_enabled, 0, 1, 0),
-    OPT_CHOICE("sub-auto-match", sub_match_fuzziness, 0,
-               ({"exact", 0}, {"fuzzy", 1}, {"all", 2})),
+    OPT_CHOICE("sub-auto", sub_auto, 0,
+               ({"no", -1}, {"exact", 0}, {"fuzzy", 1}, {"all", 2})),
     OPT_INTRANGE("sub-pos", sub_pos, 0, 0, 100),
     OPT_FLOATRANGE("sub-gauss", sub_gauss, 0, 0.0, 3.0),
     OPT_FLAG("sub-gray", sub_gray, 0),
@@ -717,7 +716,7 @@ const struct MPOpts mp_default_opts = {
     .playback_speed = 1.,
     .movie_aspect = -1.,
     .field_dominance = -1,
-    .sub_auto = 1,
+    .sub_auto = 0,
     .osd_bar_visible = 1,
 #if HAVE_LIBASS
     .ass_enabled = 1,
diff --git a/options/options.h b/options/options.h
index 2ceaa02965..da16422ff1 100644
--- a/options/options.h
+++ b/options/options.h
@@ -196,7 +196,6 @@ typedef struct MPOpts {
     char **sub_name;
     char **sub_paths;
     int sub_auto;
-    int sub_match_fuzziness;
     int osd_bar_visible;
     float osd_bar_align_x;
     float osd_bar_align_y;
-- 
cgit v1.2.3