path: root/video/out/vo_tct.c
diff options
authorwm4 <wm4@nowhere>2020-03-14 21:28:01 +0100
committerwm4 <wm4@nowhere>2020-03-18 19:52:01 +0100
commit26f4f18c0629998a9b91e94722d166866d8b80a3 (patch)
tree16d4891d241d528f63ee99f0017530bba7b3dc8b /video/out/vo_tct.c
parentcdd6eb0994bc6aeb8aeb0326e5d8c61c06eb38eb (diff)
options: change option macros and all option declarations
Change all OPT_* macros such that they don't define the entire m_option initializer, and instead expand only to a part of it, which sets certain fields. This requires changing almost every option declaration, because they all use these macros. A declaration now always starts with {"name", ... followed by designated initializers only (possibly wrapped in macros). The OPT_* macros now initialize the .offset and .type fields only, sometimes also .priv and others. I think this change makes the option macros less tricky. The old code had to stuff everything into macro arguments (and attempted to allow setting arbitrary fields by letting the user pass designated initializers in the vararg parts). Some of this was made messy due to C99 and C11 not allowing 0-sized varargs with ',' removal. It's also possible that this change is pointless, other than cosmetic preferences. Not too happy about some things. For example, the OPT_CHOICE() indentation I applied looks a bit ugly. Much of this change was done with regex search&replace, but some places required manual editing. In particular, code in "obscure" areas (which I didn't include in compilation) might be broken now. In wayland_common.c the author of some option declarations confused the flags parameter with the default value (though the default value was also properly set below). I fixed this with this change.
Diffstat (limited to 'video/out/vo_tct.c')
1 files changed, 6 insertions, 6 deletions
diff --git a/video/out/vo_tct.c b/video/out/vo_tct.c
index 8018a6ba72..ddd27d0380 100644
--- a/video/out/vo_tct.c
+++ b/video/out/vo_tct.c
@@ -58,12 +58,12 @@ struct vo_tct_opts {
#define OPT_BASE_STRUCT struct vo_tct_opts
static const struct m_sub_options vo_tct_conf = {
.opts = (const m_option_t[]) {
- OPT_CHOICE("vo-tct-algo", algo, 0,
- ({"plain", ALGO_PLAIN},
- {"half-blocks", ALGO_HALF_BLOCKS})),
- OPT_INT("vo-tct-width", width, 0),
- OPT_INT("vo-tct-height", height, 0),
- OPT_FLAG("vo-tct-256", term256, 0),
+ {"vo-tct-algo", OPT_CHOICE(algo,
+ {"plain", ALGO_PLAIN},
+ {"half-blocks", ALGO_HALF_BLOCKS})},
+ {"vo-tct-width", OPT_INT(width)},
+ {"vo-tct-height", OPT_INT(height)},
+ {"vo-tct-256", OPT_FLAG(term256)},
.defaults = &(const struct vo_tct_opts) {