From c2a36d9264313d00f696bb7decff55877fc7596e Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 21 Apr 2008 06:36:26 +0300 Subject: Move option helper #defines to cfg-common.h for now --- cfg-common.h | 6 ++++++ cfg-mplayer.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cfg-common.h b/cfg-common.h index ddac0acdac..c3438c24b5 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -379,4 +379,10 @@ extern const m_option_t xvid_dec_opts[]; int dvd_parse_chapter_range(const m_option_t*, const char*); +#define FLAG_ON(optname, varname, flags) {optname, NULL, CONF_TYPE_FLAG, flags, 0, 1, NULL, 1, offsetof(struct MPOpts, varname)} +#define FLAG_OFF(optname, varname, flags) {optname, NULL, CONF_TYPE_FLAG, flags, 1, 0, NULL, 1, offsetof(struct MPOpts, varname)} +#define FLAG_CONSTANTS(optname, varname, offvalue, value, flags) {optname, NULL, CONF_TYPE_FLAG, flags, offvalue, value, NULL, 1, offsetof(struct MPOpts, varname)} +#define STRINGLIST(optname, varname, flags) {optname, NULL, CONF_TYPE_STRING_LIST, flags, 0, 0, NULL, 1, offsetof(struct MPOpts, varname)} +#define INTRANGE(optname, varname, min, max, flags) {optname, NULL, CONF_TYPE_INT, (flags)|CONF_RANGE, min, max, NULL, 1, offsetof(struct MPOpts, varname)} + #endif /* MPLAYER_CFG_COMMON_H */ diff --git a/cfg-mplayer.h b/cfg-mplayer.h index eb7af99924..8f6d9250d9 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -87,12 +87,6 @@ const m_option_t tvscan_conf[]={ * by Folke */ -#define FLAG_ON(optname, varname, flags) {optname, NULL, CONF_TYPE_FLAG, flags, 0, 1, NULL, 1, offsetof(struct MPOpts, varname)} -#define FLAG_OFF(optname, varname, flags) {optname, NULL, CONF_TYPE_FLAG, flags, 1, 0, NULL, 1, offsetof(struct MPOpts, varname)} -#define FLAG_CONSTANTS(optname, varname, offvalue, value, flags) {optname, NULL, CONF_TYPE_FLAG, flags, offvalue, value, NULL, 1, offsetof(struct MPOpts, varname)} -#define STRINGLIST(optname, varname, flags) {optname, NULL, CONF_TYPE_STRING_LIST, flags, 0, 0, NULL, 1, offsetof(struct MPOpts, varname)} -#define INTRANGE(optname, varname, min, max, flags) {optname, NULL, CONF_TYPE_INT, (flags)|CONF_RANGE, min, max, NULL, 1, offsetof(struct MPOpts, varname)} - const m_option_t mplayer_opts[]={ /* name, pointer, type, flags, min, max */ -- cgit v1.2.3