From 98a31d5937e8397d8fcd0fefe56630a1cd765cf0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 13 Jun 2014 02:05:37 +0200
Subject: options: turn --idx, --forceidx into --index

Also clarify the semantics.

It seems --idx didn't do anything. Possibly it used to change how the
now removed legacy demuxers like demux_avi used to behave. Or maybe
it was accidental.

--forceidx basically becomes --index=force. It's possible that new
index modes will be added in the future, so I'm keeping it
extensible, instead of e.g. creating --force-index.
---
 options/m_config.c | 2 ++
 options/options.c  | 6 ++----
 options/options.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'options')

diff --git a/options/m_config.c b/options/m_config.c
index 2ebf17bb70..f3b73784a5 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -981,5 +981,7 @@ static const char *const replaced_opts =
     "|autosub#--sub-auto"
     "|native-fs#--fs-missioncontrol"
     "|status-msg#--term-status-msg"
+    "|idx#--index"
+    "|forceidx#--index"
     "|"
 ;
diff --git a/options/options.c b/options/options.c
index 63f4653317..dfa5106658 100644
--- a/options/options.c
+++ b/options/options.c
@@ -186,9 +186,7 @@ const m_option_t mp_opts[] = {
     OPT_FLAG("pause", pause, M_OPT_FIXED),
     OPT_FLAG("keep-open", keep_open, 0),
 
-    // AVI and Ogg only: (re)build index at startup
-    OPT_FLAG_CONSTANTS("idx", index_mode, 0, -1, 1),
-    OPT_FLAG_STORE("forceidx", index_mode, 0, 2),
+    OPT_CHOICE("index", index_mode, 0, ({"default", 1}, {"recreate", 0})),
 
     // select audio/video/subtitle stream
     OPT_TRACKCHOICE("aid", audio_id),
@@ -628,7 +626,7 @@ const struct MPOpts mp_default_opts = {
 
     .hwdec_codecs = "h264,vc1,wmv3",
 
-    .index_mode = -1,
+    .index_mode = 1,
 
     .dvd_angle = 1,
 
diff --git a/options/options.h b/options/options.h
index 5368c2c1e1..b93a283b61 100644
--- a/options/options.h
+++ b/options/options.h
@@ -189,7 +189,7 @@ typedef struct MPOpts {
     char *screenshot_template;
 
     double force_fps;
-    int index_mode; // -1=untouched  0=don't use index  1=use (generate) index
+    int index_mode;
 
     struct mp_chmap audio_output_channels;
     int audio_output_format;
-- 
cgit v1.2.3