summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-09-03 13:47:56 +0300
committerUoti Urpala <uau@mplayer2.org>2011-09-03 14:26:14 +0300
commit83fc5b60046b12227540f77969b5c1aa29107bad (patch)
treef72bbea73524a7b9005e3c935fafe1f20bd43991 /cfg-mplayer.h
parent3e0a2705595cbf991e0428984052488ad94c6d21 (diff)
downloadmpv-83fc5b60046b12227540f77969b5c1aa29107bad.tar.bz2
mpv-83fc5b60046b12227540f77969b5c1aa29107bad.tar.xz
options: move libass-related options to struct
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 5dd9962238..fc87ed88d8 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -693,20 +693,18 @@ const m_option_t common_opts[] = {
#endif
#ifdef CONFIG_ASS
OPT_MAKE_FLAGS("ass", ass_enabled, 0),
- {"ass-font-scale", &ass_font_scale, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
- {"ass-line-spacing", &ass_line_spacing, CONF_TYPE_FLOAT, CONF_RANGE, -1000, 1000, NULL},
- {"ass-top-margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- {"ass-bottom-margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- {"ass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"noass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+ OPT_FLOATRANGE("ass-font-scale", ass_font_scale, 0, 0, 100),
+ OPT_FLOATRANGE("ass-line-spacing", ass_line_spacing, 0, -1000, 1000),
+ OPT_INTRANGE("ass-top-margin", ass_top_margin, 0, 0, 2000),
+ OPT_INTRANGE("ass-bottom-margin", ass_bottom_margin, 0, 0, 2000),
+ OPT_MAKE_FLAGS("ass-use-margins", ass_use_margins, 0),
OPT_MAKE_FLAGS("ass-vsfilter-aspect-compat", ass_vsfilter_aspect_compat, 0),
- {"embeddedfonts", &use_embedded_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"noembeddedfonts", &use_embedded_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+ OPT_MAKE_FLAGS("embeddedfonts", use_embedded_fonts, 0),
OPT_STRINGLIST("ass-force-style", ass_force_style_list, 0),
- {"ass-color", &ass_color, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"ass-border-color", &ass_border_color, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"ass-styles", &ass_styles_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"ass-hinting", &ass_hinting, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
+ OPT_STRING("ass-color", ass_color, 0),
+ OPT_STRING("ass-border-color", ass_border_color, 0),
+ OPT_STRING("ass-styles", ass_styles_file, 0),
+ OPT_INTRANGE("ass-hinting", ass_hinting, 0, 0, 7),
#endif
#ifdef CONFIG_FONTCONFIG
{"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, -1, 1, NULL},