Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

options: deprecate --ff- options and properties

Browse Source 
Some old crap which nobody needs and which probably nobody uses.

This relies on a GCC extension: using "## __VA_ARGS__" to remove the
comma from the argument list if the va args are empty. It's supported
by clang, and there's some chance newer standards will introduce a
proper way to do this. (Even if it breaks somewhere, it will be a
problem only for 1 release, since I want to drop the deprecated
properties immediately.)
This commit is contained in:
wm4
2017-12-20 05:50:42 +01:00
committed by Martin Herkt
parent 688768b9bd
commit 2964788055
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
options/m_option.h
View File

@@ -670,8 +670,9 @@ extern const char m_option_path_separator;
#define OPT_SIZE_BOX(...) \
OPT_GENERAL(struct m_geometry, __VA_ARGS__, .type = &m_option_type_size_box)
#define OPT_TRACKCHOICE(name, var) \
OPT_CHOICE_OR_INT(name, var, 0, 0, 8190, ({"no", -2}, {"auto", -1}))
#define OPT_TRACKCHOICE(name, var, ...) \
OPT_CHOICE_OR_INT(name, var, 0, 0, 8190, ({"no", -2}, {"auto", -1}), \
## __VA_ARGS__)
#define OPT_ASPECT(...) \
OPT_GENERAL(float, __VA_ARGS__, .type = &m_option_type_aspect)

9
options/options.c
View File

@@ -323,9 +323,12 @@ const m_option_t mp_opts[] = {
OPT_TRACKCHOICE("vid", stream_id[0][STREAM_VIDEO]),
OPT_TRACKCHOICE("sid", stream_id[0][STREAM_SUB]),
OPT_TRACKCHOICE("secondary-sid", stream_id[1][STREAM_SUB]),
OPT_TRACKCHOICE("ff-aid", stream_id_ff[STREAM_AUDIO]),
OPT_TRACKCHOICE("ff-vid", stream_id_ff[STREAM_VIDEO]),
OPT_TRACKCHOICE("ff-sid", stream_id_ff[STREAM_SUB]),
OPT_TRACKCHOICE("ff-aid", stream_id_ff[STREAM_AUDIO],
.deprecation_message = "no replacement"),
OPT_TRACKCHOICE("ff-vid", stream_id_ff[STREAM_VIDEO],
.deprecation_message = "no replacement"),
OPT_TRACKCHOICE("ff-sid", stream_id_ff[STREAM_SUB],
.deprecation_message = "no replacement"),
OPT_ALIAS("sub", "sid"),
OPT_ALIAS("video", "vid"),
OPT_ALIAS("audio", "aid"),