diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-21 23:57:29 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-22 10:11:15 +0300 |
| commit | b3a688d45ff463592c73c425d68532f8f9b7880d (patch) | |
| tree | 92b21c9ceb01b999053c9dd7fce5cf1662f495e1 /cfg-common-opts.h | |
| parent | de5566f0b5420fbdbf0dc37f225be01cfd04cf66 (diff) | |
| download | mpv-b3a688d45ff463592c73c425d68532f8f9b7880d.tar.bz2 mpv-b3a688d45ff463592c73c425d68532f8f9b7880d.tar.xz | |
options: move -alang and -slang to option struct
The option field corresponding to -slang is now called "sub_lang"
instead of the old misleading global name "dvdsub_lang". The code
handling -slang in subreader.c looks rather broken; disable it instead
of converting it to use the option field.
Diffstat (limited to 'cfg-common-opts.h')
| -rw-r--r-- | cfg-common-opts.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index e969acd8ee..84b4bdeaf3 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -60,8 +60,6 @@ #endif /* CONFIG_DVDREAD */ OPT_INTPAIR("chapter", chapterrange, 0), OPT_INTRANGE("edition", edition_id, 0, -1, 8190), - {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"dvdauth", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"dvdkey", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, @@ -146,6 +144,10 @@ OPT_INTRANGE("sid", sub_id, 0, -2, 8190), OPT_FLAG_CONSTANTS("nosub", sub_id, 0, -1, -2), OPT_FLAG_CONSTANTS("novideo", video_id, 0, -1, -2), + OPT_FLAG_CONSTANTS("sound", audio_id, 0, -2, -1), + OPT_FLAG_CONSTANTS("nosound", audio_id, 0, -1, -2), + OPT_STRING("alang", audio_lang, 0), + OPT_STRING("slang", sub_lang, 0), { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "nohr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 1, 0, NULL}, @@ -222,10 +224,6 @@ {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, #endif - // disable audio - OPT_FLAG_CONSTANTS("sound", audio_id, 0, -2, -1), - OPT_FLAG_CONSTANTS("nosound", audio_id, 0, -1, -2), - {"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"af-adv", (void *) audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |