mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-19 19:42:24 +02:00
Code

options: remove some deprecated OPT_REPLACED option mapping

Browse Source 
These were all deprecated in mpv 0.37.0 or earlier and are not
considered common enough options to warrant keeping the deprecated
mapping longer. Since demux_cue had only a single option in it, the
entire option substract is removed. This can be readded later if someone
wants to introduce a specific option to it again.
This commit is contained in:
Dudemanguy 2024-06-18 11:39:43 -05:00
parent 7eec246d56
commit 6e3d90d72a
7 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DOCS/interface-changes/option-removal.txt Normal file
View File

@ -0,0 +1,7 @@
remove deprecated `--cache-dir` option alias
remove deprecated `--cache-unlink-files` option alias
remove deprecated `--demuxer-cue-codepage` option alias
remove deprecated `--fps` option alias
remove deprecated `--cdrom-device` option alias
remove deprecated `--sub-forced-only` option alias
remove deprecated `--vo-sixel-exit-clear` option alias

2
demux/cache.c
View File

@ -44,8 +44,6 @@ const struct m_sub_options demux_cache_conf = {
{"demuxer-cache-unlink-files", OPT_CHOICE(unlink_files,
{"immediate", 2}, {"whendone", 1}, {"no", 0}),
},
{"cache-dir", OPT_REPLACED("demuxer-cache-dir")},
{"cache-unlink-files", OPT_REPLACED("demuxer-cache-unlink-files")},
{0}
},
.size = sizeof(struct demux_cache_opts),

7
demux/demux_cue.c
View File

@ -41,13 +41,6 @@
#define PROBE_SIZE 512
const struct m_sub_options demux_cue_conf = {
.opts = (const m_option_t[]) {
{"codepage", OPT_REPLACED("metadata-codepage")},
{0}
},
};
struct priv {
struct cue_file *f;
};

1
filters/f_decoder_wrapper.c
View File

@ -132,7 +132,6 @@ const struct m_sub_options dec_wrapper_conf = {
M_RANGE(0, M_MAX_MEM_BYTES)},
{"audio-reversal-buffer", OPT_BYTE_SIZE(audio_reverse_size),
M_RANGE(0, M_MAX_MEM_BYTES)},
{"fps", OPT_REPLACED("container-fps-override")},
{0}
},
.size = sizeof(struct dec_wrapper_opts),

4
options/options.c
View File

@ -70,7 +70,6 @@ extern const struct m_sub_options demux_rawvideo_conf;
extern const struct m_sub_options demux_playlist_conf;
extern const struct m_sub_options demux_lavf_conf;
extern const struct m_sub_options demux_mkv_conf;
extern const struct m_sub_options demux_cue_conf;
extern const struct m_sub_options vd_lavc_conf;
extern const struct m_sub_options ad_lavc_conf;
extern const struct m_sub_options input_config;
@ -632,7 +631,6 @@ static const m_option_t mp_opts[] = {
#if HAVE_CDDA
{"cdda", OPT_SUBSTRUCT(stream_cdda_opts, stream_cdda_conf)},
{"cdrom-device", OPT_REPLACED("cdda-device")},
#endif
// demuxer.c - select audio/sub file/demuxer
@ -684,7 +682,6 @@ static const m_option_t mp_opts[] = {
{"demuxer-rawvideo", OPT_SUBSTRUCT(demux_rawvideo, demux_rawvideo_conf)},
{"", OPT_SUBSTRUCT(demux_playlist, demux_playlist_conf)},
{"demuxer-mkv", OPT_SUBSTRUCT(demux_mkv, demux_mkv_conf)},
{"demuxer-cue", OPT_SUBSTRUCT(demux_cue, demux_cue_conf)},
// ------------------------- subtitles options --------------------
@ -955,7 +952,6 @@ static const m_option_t mp_opts[] = {
{"", OPT_SUBSTRUCT(encode_opts, encode_config)},
{"play-dir", OPT_REPLACED("play-direction")},
{"sub-forced-only", OPT_REPLACED("sub-forced-events-only")},
{0}
};

1
options/options.h
View File

@ -351,7 +351,6 @@ typedef struct MPOpts {
struct demux_playlist_opts *demux_playlist;
struct demux_lavf_opts *demux_lavf;
struct demux_mkv_opts *demux_mkv;
struct demux_cue_opts *demux_cue;
struct demux_opts *demux_opts;
struct demux_cache_opts *demux_cache_opts;

1
video/out/vo_sixel.c
View File

@ -618,7 +618,6 @@ const struct vo_driver video_out_sixel = {
{"config-clear", OPT_BOOL(opts.config_clear), },
{"alt-screen", OPT_BOOL(opts.alt_screen), },
{"buffered", OPT_BOOL(opts.buffered), },
{"exit-clear", OPT_REPLACED("vo-sixel-alt-screen")},
{0}
},
.options_prefix = "vo-sixel",