mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

m_option: rename struct member named "new"

Browse Source 
Cosmetic change to allow C++ code to include this header.

See github issue #195.
This commit is contained in:
wm4 2013-08-19 12:55:34 +02:00
parent 216e8320b0
commit c5e66dde33
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mpvcore/m_config.c
View File

@ -333,7 +333,7 @@ static void add_negation_option(struct m_config *config,
.name = talloc_asprintf(no_opt, "no-%s", opt->name), .name = talloc_asprintf(no_opt, "no-%s", opt->name),
.type = CONF_TYPE_STORE, .type = CONF_TYPE_STORE,
.flags = opt->flags & (M_OPT_NOCFG | M_OPT_GLOBAL | M_OPT_PRE_PARSE), .flags = opt->flags & (M_OPT_NOCFG | M_OPT_GLOBAL | M_OPT_PRE_PARSE),
.new = opt->new, .is_new_option = opt->is_new_option,
.p = opt->p, .p = opt->p,
.offset = opt->offset, .offset = opt->offset,
.max = value, .max = value,
@ -381,7 +381,7 @@ static struct m_config_option *m_config_add_option(struct m_config *config,
void *optstruct = config->optstruct; void *optstruct = config->optstruct;
if (parent && (parent->opt->type->flags & M_OPT_TYPE_USE_SUBSTRUCT)) if (parent && (parent->opt->type->flags & M_OPT_TYPE_USE_SUBSTRUCT))
optstruct = substruct_read_ptr(parent->data); optstruct = substruct_read_ptr(parent->data);
co->data = arg->new ? (char *)optstruct + arg->offset : arg->p; co->data = arg->is_new_option ? (char *)optstruct + arg->offset : arg->p;
if (parent) { if (parent) {
// Merge case: pretend it has no parent (note that we still must follow // Merge case: pretend it has no parent (note that we still must follow

6
mpvcore/m_option.h
View File

@ -313,7 +313,7 @@ struct m_option {
*/ */
void *priv; void *priv;
int new; int is_new_option;
int offset; int offset;
@ -505,12 +505,12 @@ int m_option_required_params(const m_option_t *opt);
#define OPTDEF_INT(i) .defval = (void *)&(const int){i} #define OPTDEF_INT(i) .defval = (void *)&(const int){i}
#define OPT_GENERAL(ctype, optname, varname, flagv, ...) \ #define OPT_GENERAL(ctype, optname, varname, flagv, ...) \
{.name = optname, .flags = flagv, .new = 1, \ {.name = optname, .flags = flagv, .is_new_option = 1, \
.offset = MP_CHECKED_OFFSETOF(OPT_BASE_STRUCT, varname, ctype), \ .offset = MP_CHECKED_OFFSETOF(OPT_BASE_STRUCT, varname, ctype), \
__VA_ARGS__} __VA_ARGS__}
#define OPT_GENERAL_NOTYPE(optname, varname, flagv, ...) \ #define OPT_GENERAL_NOTYPE(optname, varname, flagv, ...) \
{.name = optname, .flags = flagv, .new = 1, \ {.name = optname, .flags = flagv, .is_new_option = 1, \
.offset = offsetof(OPT_BASE_STRUCT, varname), \ .offset = offsetof(OPT_BASE_STRUCT, varname), \
__VA_ARGS__} __VA_ARGS__}