github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

cleanup: reformat and clean up m_config.[ch] 

m_config.c changes include removal of "#ifdef MP_DEBUG" from around
some assert lines.
This commit is contained in:
Uoti Urpala 2011-07-05 22:31:44 +03:00
parent befed529bc
commit 1f6970b855
2 changed files with 502 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

805
m_config.c
View File

@ -26,9 +26,7 @@
#include <errno.h>
#include <string.h>
#include "talloc.h"
#ifdef MP_DEBUG
#include <assert.h>
#endif
#include "m_config.h"
#include "m_option.h"
@ -36,24 +34,25 @@
#define MAX_PROFILE_DEPTH 20
static int parse_profile(const m_option_t *opt, const char *name,
static int parse_profile(const struct m_option *opt, const char *name,
const char *param, void *dst, int src)
{
m_config_t *config = opt->priv;
struct m_config *config = opt->priv;
char **list = NULL;
int i, r;
if (param && !strcmp(param, "help")) {
m_profile_t *p;
struct m_profile *p;
if (!config->profiles) {
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "No profiles have been defined.\n");
return M_OPT_EXIT-1;
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO,
"No profiles have been defined.\n");
return M_OPT_EXIT - 1;
}
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "Available profiles:\n");
for (p = config->profiles; p; p = p->next)
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\t%s\t%s\n", p->name,
p->desc ? p->desc : "");
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n");
return M_OPT_EXIT-1;
return M_OPT_EXIT - 1;
}
r = m_option_type_string_list.parse(opt, name, param, &list, src);
@ -62,7 +61,7 @@ static int parse_profile(const m_option_t *opt, const char *name,
if (!list || !list[0])
return M_OPT_INVALID;
for (i = 0; list[i]; i++)
if (!m_config_get_profile(config,list[i])) {
if (!m_config_get_profile(config, list[i])) {
mp_tmsg(MSGT_CFGPARSER, MSGL_WARN, "Unknown profile '%s'.\n",
list[i]);
r = M_OPT_INVALID;
@ -74,13 +73,13 @@ static int parse_profile(const m_option_t *opt, const char *name,
return r;
}
static void set_profile(const m_option_t *opt, void *dst, const void *src)
static void set_profile(const struct m_option *opt, void *dst, const void *src)
{
m_config_t *config = opt->priv;
m_profile_t *p;
struct m_config *config = opt->priv;
struct m_profile *p;
char **list = NULL;
int i;
if (!src || !*(char***)src)
if (!src || !*(char ***)src)
return;
m_option_copy(opt, &list, src);
for (i = 0; list[i]; i++) {
@ -92,10 +91,10 @@ static void set_profile(const m_option_t *opt, void *dst, const void *src)
m_option_free(opt, &list);
}
static int show_profile(m_option_t *opt, char* name, char *param)
static int show_profile(struct m_option *opt, char *name, char *param)
{
m_config_t *config = opt->priv;
m_profile_t *p;
struct m_config *config = opt->priv;
struct m_profile *p;
int i, j;
if (!param)
return M_OPT_MISSING_PARAM;
@ -120,14 +119,14 @@ static int show_profile(m_option_t *opt, char* name, char *param)
&& !strcmp(p->opts[2*i], "profile")) {
char *e, *list = p->opts[2 * i + 1];
while ((e = strchr(list, ','))) {
int l = e-list;
int l = e - list;
char tmp[l+1];
if (!l)
continue;
memcpy(tmp, list, l);
tmp[l] = '\0';
show_profile(opt, name, tmp);
list = e+1;
list = e + 1;
}
if (list[0] != '\0')
show_profile(opt, name, list);
@ -139,15 +138,15 @@ static int show_profile(m_option_t *opt, char* name, char *param)
return M_OPT_EXIT - 1;
}
static int list_options(m_option_t *opt, char *name, char *param)
static int list_options(struct m_option *opt, char *name, char *param)
{
m_config_t *config = opt->priv;
struct m_config *config = opt->priv;
m_config_print_option_list(config);
return M_OPT_EXIT;
}
static void m_option_save(const m_config_t *config, const m_option_t *opt,
void *dst)
static void m_option_save(const struct m_config *config,
const struct m_option *opt, void *dst)
{
if (opt->type->save) {
const void *src = m_option_get_ptr(opt, config->optstruct);
@ -155,8 +154,8 @@ static void m_option_save(const m_config_t *config, const m_option_t *opt,
}
}
static void m_option_set(const m_config_t *config, const m_option_t *opt,
const void *src)
static void m_option_set(const struct m_config *config,
const struct m_option *opt, const void *src)
{
if (opt->type->set) {
void *dst = m_option_get_ptr(opt, config->optstruct);
@ -166,438 +165,452 @@ static void m_option_set(const m_config_t *config, const m_option_t *opt,
static void
m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix);
static void m_config_add_option(struct m_config *config,
const struct m_option *arg,
const char *prefix);
m_config_t *m_config_new(void *optstruct,
int includefunc(m_option_t *conf, char *filename))
struct m_config *m_config_new(void *optstruct,
int includefunc(struct m_option *conf,
char *filename))
{
m_config_t* config;
static int initialized = 0;
static m_option_type_t profile_opt_type;
static const m_option_t ref_opts[] = {
{ "profile", NULL, &profile_opt_type, CONF_NOSAVE, 0, 0, NULL },
{ "show-profile", show_profile, CONF_TYPE_PRINT_FUNC, CONF_NOCFG, 0, 0, NULL },
{ "list-options", list_options, CONF_TYPE_PRINT_FUNC, CONF_NOCFG, 0, 0, NULL },
{ NULL, NULL, NULL, 0, 0, 0, NULL }
};
int i;
struct m_config *config;
static int initialized = 0;
static struct m_option_type profile_opt_type;
static const struct m_option ref_opts[] = {
{ "profile", NULL, &profile_opt_type, CONF_NOSAVE, 0, 0, NULL },
{ "show-profile", show_profile, CONF_TYPE_PRINT_FUNC, CONF_NOCFG },
{ "list-options", list_options, CONF_TYPE_PRINT_FUNC, CONF_NOCFG },
{ NULL }
};
int i;
config = talloc_zero(NULL, m_config_t);
config->lvl = 1; // 0 Is the defaults
if(!initialized) {
initialized = 1;
profile_opt_type = m_option_type_string_list;
profile_opt_type.parse = parse_profile;
profile_opt_type.set = set_profile;
}
m_option_t *self_opts = talloc_memdup(config, ref_opts, sizeof(ref_opts));
for (i = 0; self_opts[i].name; i++)
self_opts[i].priv = config;
m_config_register_options(config, self_opts);
if (includefunc) {
struct m_option *p = talloc_ptrtype(config, p);
*p = (struct m_option){"include", includefunc, CONF_TYPE_FUNC_PARAM,
CONF_NOSAVE, 0, 0, config};
m_config_add_option(config, p, NULL);
}
config->optstruct = optstruct;
config = talloc_zero(NULL, struct m_config);
config->lvl = 1; // 0 Is the defaults
if (!initialized) {
initialized = 1;
profile_opt_type = m_option_type_string_list;
profile_opt_type.parse = parse_profile;
profile_opt_type.set = set_profile;
}
struct m_option *self_opts = talloc_memdup(config, ref_opts,
sizeof(ref_opts));
for (i = 0; self_opts[i].name; i++)
self_opts[i].priv = config;
m_config_register_options(config, self_opts);
if (includefunc) {
struct m_option *p = talloc_ptrtype(config, p);
*p = (struct m_option){
"include", includefunc, CONF_TYPE_FUNC_PARAM,
CONF_NOSAVE, 0, 0, config
};
m_config_add_option(config, p, NULL);
}
config->optstruct = optstruct;
return config;
return config;
}
void m_config_free(m_config_t* config)
void m_config_free(struct m_config *config)
{
m_config_option_t *opt;
for (opt = config->opts; opt; opt = opt->next) {
if (opt->flags & M_CFG_OPT_ALIAS)
struct m_config_option *copt;
for (copt = config->opts; copt; copt = copt->next) {
if (copt->flags & M_CFG_OPT_ALIAS)
continue;
m_config_save_slot_t *sl;
for (sl = opt->slots; sl; sl = sl->prev)
m_option_free(opt->opt, sl->data);
struct m_config_save_slot *sl;
for (sl = copt->slots; sl; sl = sl->prev)
m_option_free(copt->opt, sl->data);
}
talloc_free(config);
}
void
m_config_push(m_config_t* config) {
m_config_option_t *co;
m_config_save_slot_t *slot;
void m_config_push(struct m_config *config)
{
struct m_config_option *co;
struct m_config_save_slot *slot;
#ifdef MP_DEBUG
assert(config != NULL);
assert(config->lvl > 0);
#endif
assert(config != NULL);
assert(config->lvl > 0);
config->lvl++;
config->lvl++;
for(co = config->opts ; co ; co = co->next ) {
if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
continue;
if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE))
continue;
if(co->flags & M_CFG_OPT_ALIAS)
continue;
for (co = config->opts; co; co = co->next) {
if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
continue;
if (co->opt->flags & (M_OPT_GLOBAL | M_OPT_NOSAVE))
continue;
if (co->flags & M_CFG_OPT_ALIAS)
continue;
// Update the current status
m_option_save(config, co->opt, co->slots->data);
// Update the current status
m_option_save(config, co->opt, co->slots->data);
// Allocate a new slot
slot = talloc_zero_size(co, sizeof(m_config_save_slot_t) +
// Allocate a new slot
slot = talloc_zero_size(co, sizeof(struct m_config_save_slot) +
co->opt->type->size);
slot->lvl = config->lvl;
slot->prev = co->slots;
co->slots = slot;
m_option_copy(co->opt,co->slots->data,co->slots->prev->data);
// Reset our set flag
co->flags &= ~M_CFG_OPT_SET;
}
slot->lvl = config->lvl;
slot->prev = co->slots;
co->slots = slot;
m_option_copy(co->opt, co->slots->data, co->slots->prev->data);
// Reset our set flag
co->flags &= ~M_CFG_OPT_SET;
}
mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config pushed level is now %d\n",config->lvl);
mp_msg(MSGT_CFGPARSER, MSGL_DBG2,
"Config pushed level is now %d\n", config->lvl);
}
void
m_config_pop(m_config_t* config) {
m_config_option_t *co;
m_config_save_slot_t *slot;
void m_config_pop(struct m_config *config)
{
struct m_config_option *co;
struct m_config_save_slot *slot;
#ifdef MP_DEBUG
assert(config != NULL);
assert(config->lvl > 1);
#endif
assert(config != NULL);
assert(config->lvl > 1);
for(co = config->opts ; co ; co = co->next ) {
int pop = 0;
if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
continue;
if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE))
continue;
if(co->flags & M_CFG_OPT_ALIAS)
continue;
if(co->slots->lvl > config->lvl)
mp_tmsg(MSGT_CFGPARSER, MSGL_WARN,"Save slot found from lvl %d is too old: %d !!!\n",config->lvl,co->slots->lvl);
for (co = config->opts; co; co = co->next) {
int pop = 0;
if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD)
continue;
if (co->opt->flags & (M_OPT_GLOBAL | M_OPT_NOSAVE))
continue;
if (co->flags & M_CFG_OPT_ALIAS)
continue;
if (co->slots->lvl > config->lvl)
mp_msg(MSGT_CFGPARSER, MSGL_WARN,
"Save slot found from lvl %d is too old: %d !!!\n",
config->lvl, co->slots->lvl);
while(co->slots->lvl >= config->lvl) {
m_option_free(co->opt,co->slots->data);
slot = co->slots;
co->slots = slot->prev;
talloc_free(slot);
pop++;
while (co->slots->lvl >= config->lvl) {
m_option_free(co->opt, co->slots->data);
slot = co->slots;
co->slots = slot->prev;
talloc_free(slot);
pop++;
}
if (pop) // We removed some ctx -> set the previous value
m_option_set(config, co->opt, co->slots->data);
}
if(pop) // We removed some ctx -> set the previous value
m_option_set(config, co->opt, co->slots->data);
}
config->lvl--;
mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config poped level=%d\n",config->lvl);
config->lvl--;
mp_msg(MSGT_CFGPARSER, MSGL_DBG2, "Config poped level=%d\n", config->lvl);
}
static void
m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix) {
m_config_option_t *co;
m_config_save_slot_t* sl;
static void m_config_add_option(struct m_config *config,
const struct m_option *arg, const char *prefix)
{
struct m_config_option *co;
struct m_config_save_slot *sl;
#ifdef MP_DEBUG
assert(config != NULL);
assert(config->lvl > 0);
assert(arg != NULL);
#endif
assert(config != NULL);
assert(config->lvl > 0);
assert(arg != NULL);
// Allocate a new entry for this option
co = talloc_zero_size(config, sizeof(m_config_option_t) + arg->type->size);
co->opt = arg;
// Allocate a new entry for this option
co = talloc_zero_size(config,
sizeof(struct m_config_option) + arg->type->size);
co->opt = arg;
// Fill in the full name
if (prefix && *prefix)
co->name = talloc_asprintf(co, "%s:%s", prefix, arg->name);
else
co->name = (char *)arg->name;
// Fill in the full name
if (prefix && *prefix)
co->name = talloc_asprintf(co, "%s:%s", prefix, arg->name);
else
co->name = (char *)arg->name;
// Option with children -> add them
if(arg->type->flags & M_OPT_TYPE_HAS_CHILD) {
const m_option_t *ol = arg->p;
int i;
co->slots = NULL;
for(i = 0 ; ol[i].name != NULL ; i++)
m_config_add_option(config,&ol[i], co->name);
} else {
m_config_option_t *i;
// Check if there is already an option pointing to this address
if(arg->p || arg->new && arg->offset >= 0) {
for(i = config->opts ; i ; i = i->next ) {
if (arg->new ? (i->opt->new && i->opt->offset == arg->offset)
: (!i->opt->new && i->opt->p == arg->p)) {
// So we don't save the same vars more than 1 time
co->slots = i->slots;
co->flags |= M_CFG_OPT_ALIAS;
break;
}
}
}
if(!(co->flags & M_CFG_OPT_ALIAS)) {
// Allocate a slot for the defaults
sl = talloc_zero_size(co, sizeof(m_config_save_slot_t) +
arg->type->size);
m_option_save(config, arg, sl->data);
// Hack to avoid too much trouble with dynamically allocated data :
// We always use a dynamic version
if ((arg->type->flags & M_OPT_TYPE_DYNAMIC)) {
char **hackptr = arg->new ? (char*)config->optstruct + arg->offset
: arg->p;
if (hackptr && *hackptr) {
*hackptr = NULL;
m_option_set(config, arg, sl->data);
// Option with children -> add them
if (arg->type->flags & M_OPT_TYPE_HAS_CHILD) {
const struct m_option *ol = arg->p;
int i;
co->slots = NULL;
for (i = 0; ol[i].name != NULL; i++)
m_config_add_option(config, &ol[i], co->name);
} else {
struct m_config_option *i;
// Check if there is already an option pointing to this address
if (arg->p || arg->new && arg->offset >= 0) {
for (i = config->opts; i; i = i->next) {
if (arg->new ? (i->opt->new && i->opt->offset == arg->offset)
: (!i->opt->new && i->opt->p == arg->p)) {
// So we don't save the same vars more than 1 time
co->slots = i->slots;
co->flags |= M_CFG_OPT_ALIAS;
break;
}
}
}
sl->lvl = 0;
sl->prev = NULL;
co->slots = talloc_zero_size(co, sizeof(m_config_save_slot_t) +
arg->type->size);
co->slots->prev = sl;
co->slots->lvl = config->lvl;
m_option_copy(co->opt, co->slots->data, sl->data);
if (!(co->flags & M_CFG_OPT_ALIAS)) {
// Allocate a slot for the defaults
sl = talloc_zero_size(co, sizeof(struct m_config_save_slot) +
arg->type->size);
m_option_save(config, arg, sl->data);
// Hack to avoid too much trouble with dynamically allocated data:
// We replace original default and always use a dynamic version
if ((arg->type->flags & M_OPT_TYPE_DYNAMIC)) {
char **hackptr = m_option_get_ptr(arg, config->optstruct);
if (hackptr && *hackptr) {
*hackptr = NULL;
m_option_set(config, arg, sl->data);
}
}
sl->lvl = 0;
sl->prev = NULL;
co->slots = talloc_zero_size(co, sizeof(struct m_config_save_slot) +
arg->type->size);
co->slots->prev = sl;
co->slots->lvl = config->lvl;
m_option_copy(co->opt, co->slots->data, sl->data);
}
}
}
co->next = config->opts;
config->opts = co;
co->next = config->opts;
config->opts = co;
}
int
m_config_register_options(m_config_t *config, const m_option_t *args) {
int i;
int m_config_register_options(struct m_config *config,
const struct m_option *args)
{
int i;
#ifdef MP_DEBUG
assert(config != NULL);
assert(config->lvl > 0);
assert(args != NULL);
#endif
assert(config != NULL);
assert(config->lvl > 0);
assert(args != NULL);
for(i = 0 ; args[i].name != NULL ; i++)
m_config_add_option(config,&args[i],NULL);
for (i = 0; args[i].name != NULL; i++)
m_config_add_option(config, &args[i], NULL);
return 1;
return 1;
}
static m_config_option_t*
m_config_get_co(const m_config_t *config, char *arg) {
m_config_option_t *co;
static struct m_config_option *m_config_get_co(const struct m_config *config,
char *arg)
{
struct m_config_option *co;
for(co = config->opts ; co ; co = co->next ) {
int l = strlen(co->name) - 1;
if((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD) &&
(co->name[l] == '*')) {
if(strncasecmp(co->name,arg,l) == 0)
return co;
} else if(strcasecmp(co->name,arg) == 0)
return co;
}
return NULL;
}
static int
m_config_parse_option(const m_config_t *config, char *arg, char *param, int set) {
m_config_option_t *co;
int r = 0;
#ifdef MP_DEBUG
assert(config != NULL);
assert(config->lvl > 0);
assert(arg != NULL);
#endif
co = m_config_get_co(config,arg);
if(!co){
// mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg);
return M_OPT_UNKNOWN;
}
#ifdef MP_DEBUG
// This is the only mandatory function
assert(co->opt->type->parse);
#endif
// Check if this option isn't forbidden in the current mode
if((config->mode == M_CONFIG_FILE) && (co->opt->flags & M_OPT_NOCFG)) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"The %s option can't be used in a config file.\n",arg);
return M_OPT_INVALID;
}
if((config->mode == M_COMMAND_LINE) && (co->opt->flags & M_OPT_NOCMD)) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"The %s option can't be used on the command line.\n",arg);
return M_OPT_INVALID;
}
// During command line preparse set only pre-parse options
// Otherwise only set pre-parse option if they were not already set.
if(((config->mode == M_COMMAND_LINE_PRE_PARSE) &&
!(co->opt->flags & M_OPT_PRE_PARSE)) ||
((config->mode != M_COMMAND_LINE_PRE_PARSE) &&
(co->opt->flags & M_OPT_PRE_PARSE) && (co->flags & M_CFG_OPT_SET)))
set = 0;
// Option with children are a bit different to parse
if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) {
char** lst = NULL;
int i,sr;
// Parse the child options
r = m_option_parse(co->opt,arg,param,&lst,M_COMMAND_LINE);
// Set them now
if(r >= 0)
for(i = 0 ; lst && lst[2*i] ; i++) {
int l = strlen(co->name) + 1 + strlen(lst[2*i]) + 1;
if(r >= 0) {
// Build the full name
char n[l];
sprintf(n,"%s:%s",co->name,lst[2*i]);
sr = m_config_parse_option(config,n,lst[2*i+1],set);
if(sr < 0){
if(sr == M_OPT_UNKNOWN){
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' has no suboption '%s'.\n",co->name,lst[2*i]);
r = M_OPT_INVALID;
} else
if(sr == M_OPT_MISSING_PARAM){
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"Error: suboption '%s' of '%s' must have a parameter!\n",lst[2*i],co->name);
r = M_OPT_INVALID;
} else
r = sr;
}
}
free(lst[2*i]);
free(lst[2*i+1]);
for (co = config->opts; co; co = co->next) {
int l = strlen(co->name) - 1;
if ((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD) &&
(co->name[l] == '*')) {
if (strncasecmp(co->name, arg, l) == 0)
return co;
} else if (strcasecmp(co->name, arg) == 0)
return co;
}
free(lst);
} else
r = m_option_parse(co->opt,arg,param,set ? co->slots->data : NULL,config->mode);
// Parsing failed ?
if(r < 0)
return r;
// Set the option
if(set) {
m_option_set(config, co->opt, co->slots->data);
co->flags |= M_CFG_OPT_SET;
}
return r;
}
int
m_config_set_option(m_config_t *config, char* arg, char* param) {
mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Setting %s=%s\n",arg,param);
return m_config_parse_option(config,arg,param,1);
}
int
m_config_check_option(const m_config_t *config, char *arg, char *param) {
int r;
mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Checking %s=%s\n",arg,param);
r=m_config_parse_option(config,arg,param,0);
if(r==M_OPT_MISSING_PARAM){
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' must have a parameter!\n",arg);
return M_OPT_INVALID;
}
return r;
}
const m_option_t*
m_config_get_option(const m_config_t *config, char *arg) {
m_config_option_t *co;
#ifdef MP_DEBUG
assert(config != NULL);
assert(config->lvl > 0);
assert(arg != NULL);
#endif
co = m_config_get_co(config,arg);
if(co)
return co->opt;
else
return NULL;
}
void
m_config_print_option_list(const m_config_t *config) {
char min[50],max[50];
m_config_option_t* co;
int count = 0;
static int m_config_parse_option(const struct m_config *config, char *arg,
char *param, int set)
{
struct m_config_option *co;
int r = 0;
if(!config->opts) return;
assert(config != NULL);
assert(config->lvl > 0);
assert(arg != NULL);
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\n Name Type Min Max Global CL Cfg\n\n");
for(co = config->opts ; co ; co = co->next) {
const m_option_t* opt = co->opt;
if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue;
if(opt->flags & M_OPT_MIN)
sprintf(min,"%-8.0f",opt->min);
co = m_config_get_co(config, arg);
if (!co) {
return M_OPT_UNKNOWN;
}
// This is the only mandatory function
assert(co->opt->type->parse);
// Check if this option isn't forbidden in the current mode
if ((config->mode == M_CONFIG_FILE) && (co->opt->flags & M_OPT_NOCFG)) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"The %s option can't be used in a config file.\n", arg);
return M_OPT_INVALID;
}
if ((config->mode == M_COMMAND_LINE) && (co->opt->flags & M_OPT_NOCMD)) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"The %s option can't be used on the command line.\n", arg);
return M_OPT_INVALID;
}
// During command line preparse set only pre-parse options
// Otherwise only set pre-parse option if they were not already set.
if (((config->mode == M_COMMAND_LINE_PRE_PARSE) &&
!(co->opt->flags & M_OPT_PRE_PARSE)) ||
((config->mode != M_COMMAND_LINE_PRE_PARSE) &&
(co->opt->flags & M_OPT_PRE_PARSE) && (co->flags & M_CFG_OPT_SET)))
set = 0;
// Option with children are a bit different to parse
if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) {
char **lst = NULL;
int i, sr;
// Parse the child options
r = m_option_parse(co->opt, arg, param, &lst, M_COMMAND_LINE);
// Set them now
if (r >= 0)
for (i = 0; lst && lst[2 * i]; i++) {
int l = strlen(co->name) + 1 + strlen(lst[2 * i]) + 1;
if (r >= 0) {
// Build the full name
char n[l];
sprintf(n, "%s:%s", co->name, lst[2 * i]);
sr = m_config_parse_option(config, n, lst[2 * i + 1], set);
if (sr < 0) {
if (sr == M_OPT_UNKNOWN) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"Error: option '%s' has no suboption '%s'.\n",
co->name, lst[2 * i]);
r = M_OPT_INVALID;
} else if (sr == M_OPT_MISSING_PARAM) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"Error: suboption '%s' of '%s' must have "
"a parameter!\n", lst[2 * i], co->name);
r = M_OPT_INVALID;
} else
r = sr;
}
}
free(lst[2 * i]);
free(lst[2 * i + 1]);
}
free(lst);
} else
r = m_option_parse(co->opt, arg, param, set ? co->slots->data : NULL,
config->mode);
// Parsing failed ?
if (r < 0)
return r;
// Set the option
if (set) {
m_option_set(config, co->opt, co->slots->data);
co->flags |= M_CFG_OPT_SET;
}
return r;
}
int m_config_set_option(struct m_config *config, char *arg, char *param)
{
mp_msg(MSGT_CFGPARSER, MSGL_DBG2, "Setting %s=%s\n", arg, param);
return m_config_parse_option(config, arg, param, 1);
}
int m_config_check_option(const struct m_config *config, char *arg, char *param)
{
int r;
mp_msg(MSGT_CFGPARSER, MSGL_DBG2, "Checking %s=%s\n", arg, param);
r = m_config_parse_option(config, arg, param, 0);
if (r == M_OPT_MISSING_PARAM) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"Error: option '%s' must have a parameter!\n", arg);
return M_OPT_INVALID;
}
return r;
}
const struct m_option *m_config_get_option(const struct m_config *config,
char *arg)
{
struct m_config_option *co;
assert(config != NULL);
assert(config->lvl > 0);
assert(arg != NULL);
co = m_config_get_co(config, arg);
if (co)
return co->opt;
else
strcpy(min,"No");
if(opt->flags & M_OPT_MAX)
sprintf(max,"%-8.0f",opt->max);
else
strcpy(max,"No");
mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %-20.20s %-15.15s %-10.10s %-10.10s %-3.3s %-3.3s %-3.3s\n",
co->name,
co->opt->type->name,
min,
max,
opt->flags & CONF_GLOBAL ? "Yes" : "No",
opt->flags & CONF_NOCMD ? "No" : "Yes",
opt->flags & CONF_NOCFG ? "No" : "Yes");
count++;
}
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\nTotal: %d options\n",count);
return NULL;
}
m_profile_t*
m_config_get_profile(const m_config_t *config, char *name) {
m_profile_t* p;
for(p = config->profiles ; p ; p = p->next)
if(!strcmp(p->name,name)) return p;
return NULL;
void m_config_print_option_list(const struct m_config *config)
{
char min[50], max[50];
struct m_config_option *co;
int count = 0;
if (!config->opts)
return;
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO,
"\n Name Type Min Max Global CL Cfg\n\n");
for (co = config->opts; co; co = co->next) {
const struct m_option *opt = co->opt;
if (opt->type->flags & M_OPT_TYPE_HAS_CHILD)
continue;
if (opt->flags & M_OPT_MIN)
sprintf(min, "%-8.0f", opt->min);
else
strcpy(min, "No");
if (opt->flags & M_OPT_MAX)
sprintf(max, "%-8.0f", opt->max);
else
strcpy(max, "No");
mp_msg(MSGT_CFGPARSER, MSGL_INFO,
" %-20.20s %-15.15s %-10.10s %-10.10s %-3.3s %-3.3s %-3.3s\n",
co->name,
co->opt->type->name,
min,
max,
opt->flags & CONF_GLOBAL ? "Yes" : "No",
opt->flags & CONF_NOCMD ? "No" : "Yes",
opt->flags & CONF_NOCFG ? "No" : "Yes");
count++;
}
mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\nTotal: %d options\n", count);
}
m_profile_t*
m_config_add_profile(m_config_t* config, char* name) {
m_profile_t* p = m_config_get_profile(config,name);
if(p) return p;
p = talloc_zero(config, m_profile_t);
p->name = talloc_strdup(p, name);
p->next = config->profiles;
config->profiles = p;
return p;
struct m_profile *m_config_get_profile(const struct m_config *config,
char *name)
{
struct m_profile *p;
for (p = config->profiles; p; p = p->next)
if (!strcmp(p->name, name))
return p;
return NULL;
}
void
m_profile_set_desc(m_profile_t* p, char* desc) {
struct m_profile *m_config_add_profile(struct m_config *config, char *name)
{
struct m_profile *p = m_config_get_profile(config, name);
if (p)
return p;
p = talloc_zero(config, struct m_profile);
p->name = talloc_strdup(p, name);
p->next = config->profiles;
config->profiles = p;
return p;
}
void m_profile_set_desc(struct m_profile *p, char *desc)
{
talloc_free(p->desc);
p->desc = talloc_strdup(p, desc);
}
int
m_config_set_profile_option(m_config_t* config, m_profile_t* p,
char* name, char* val) {
int i = m_config_check_option(config,name,val);
if(i < 0) return i;
p->opts = talloc_realloc(p, p->opts, char *, 2*(p->num_opts+2));
p->opts[p->num_opts*2] = talloc_strdup(p, name);
p->opts[p->num_opts*2+1] = talloc_strdup(p, val);
p->num_opts++;
p->opts[p->num_opts*2] = p->opts[p->num_opts*2+1] = NULL;
return 1;
int m_config_set_profile_option(struct m_config *config, struct m_profile *p,
char *name, char *val)
{
int i = m_config_check_option(config, name, val);
if (i < 0)
return i;
p->opts = talloc_realloc(p, p->opts, char *, 2 * (p->num_opts + 2));
p->opts[p->num_opts * 2] = talloc_strdup(p, name);
p->opts[p->num_opts * 2 + 1] = talloc_strdup(p, val);
p->num_opts++;
p->opts[p->num_opts * 2] = p->opts[p->num_opts * 2 + 1] = NULL;
return 1;
}
void
m_config_set_profile(m_config_t* config, m_profile_t* p) {
int i;
if(config->profile_depth > MAX_PROFILE_DEPTH) {
mp_tmsg(MSGT_CFGPARSER, MSGL_WARN, "WARNING: Profile inclusion too deep.\n");
return;
}
int prev_mode = config->mode;
config->mode = M_CONFIG_FILE;
config->profile_depth++;
for(i = 0 ; i < p->num_opts ; i++)
m_config_set_option(config,p->opts[2*i],p->opts[2*i+1]);
config->profile_depth--;
config->mode = prev_mode;
void m_config_set_profile(struct m_config *config, struct m_profile *p)
{
int i;
if (config->profile_depth > MAX_PROFILE_DEPTH) {
mp_tmsg(MSGT_CFGPARSER, MSGL_WARN,
"WARNING: Profile inclusion too deep.\n");
return;
}
int prev_mode = config->mode;
config->mode = M_CONFIG_FILE;
config->profile_depth++;
for (i = 0; i < p->num_opts; i++)
m_config_set_option(config, p->opts[2 * i], p->opts[2 * i + 1]);
config->profile_depth--;
config->mode = prev_mode;
}

223
m_config.h
View File

@ -19,210 +19,173 @@
#ifndef MPLAYER_M_CONFIG_H
#define MPLAYER_M_CONFIG_H
/// \defgroup Config Config manager
///
/// m_config provides an API to manipulate the config variables in MPlayer.
/// It makes use of the \ref Options API to provide a context stack that
/// allows saving and later restoring the state of all variables.
///@{
// m_config provides an API to manipulate the config variables in MPlayer.
// It makes use of the Options API to provide a context stack that
// allows saving and later restoring the state of all variables.
/// \file
typedef struct m_config_option m_config_option_t;
typedef struct m_config_save_slot m_config_save_slot_t;
/// \ingroup ConfigProfiles
typedef struct m_profile m_profile_t;
struct m_option;
struct m_option_type;
/// Config option save slot
// Config option save slot
struct m_config_save_slot {
/// Previous level slot.
m_config_save_slot_t* prev;
/// Level at which the save was made.
int lvl;
// We have to store other datatypes in this as well,
// so make sure we get properly aligned addresses.
unsigned char data[0] __attribute__ ((aligned (8)));
// Previous level slot.
struct m_config_save_slot *prev;
// Level at which the save was made.
int lvl;
// We have to store other datatypes in this as well,
// so make sure we get properly aligned addresses.
unsigned char data[0] __attribute__ ((aligned(8)));
};
/// Config option
// Config option
struct m_config_option {
m_config_option_t* next;
/// Full name (ie option:subopt).
char* name;
/// Option description.
const struct m_option* opt;
/// Save slot stack.
m_config_save_slot_t* slots;
/// See \ref ConfigOptionFlags.
unsigned int flags;
struct m_config_option *next;
// Full name (ie option:subopt).
char *name;
// Option description.
const struct m_option *opt;
// Save slot stack.
struct m_config_save_slot *slots;
// See \ref ConfigOptionFlags.
unsigned int flags;
};
/// \defgroup ConfigProfiles Config profiles
/// \ingroup Config
///
/// Profiles allow to predefine some sets of options that can then
/// be applied later on with the internal -profile option.
///
///@{
// Profiles allow to predefine some sets of options that can then
// be applied later on with the internal -profile option.
/// Config profile
// Config profile
struct m_profile {
m_profile_t* next;
char* name;
char* desc;
int num_opts;
/// Option/value pair array.
char** opts;
struct m_profile *next;
char *name;
char *desc;
int num_opts;
// Option/value pair array.
char **opts;
};
///@}
/// Config object
// Config object
/** \ingroup Config */
typedef struct m_config {
/// Registered options.
/** This contains all options and suboptions.
*/
m_config_option_t* opts;
/// Current stack level.
int lvl;
/// \ref OptionParserModes
int mode;
/// List of defined profiles.
m_profile_t* profiles;
/// Depth when recursively including profiles.
int profile_depth;
// Registered options.
/** This contains all options and suboptions.
*/
struct m_config_option *opts;
// Current stack level.
int lvl;
// \ref OptionParserModes
int mode;
// List of defined profiles.
struct m_profile *profiles;
// Depth when recursively including profiles.
int profile_depth;
void *optstruct; // struct mpopts or other
void *optstruct; // struct mpopts or other
} m_config_t;
/// \defgroup ConfigOptionFlags Config option flags
/// \ingroup Config
///@{
/// Set if an option has been set at the current level.
#define M_CFG_OPT_SET (1<<0)
// Set if an option has been set at the current level.
#define M_CFG_OPT_SET (1 << 0)
/// Set if another option already uses the same variable.
#define M_CFG_OPT_ALIAS (1<<1)
// Set if another option already uses the same variable.
#define M_CFG_OPT_ALIAS (1 << 1)
///@}
/// Create a new config object.
/** \ingroup Config
*/
m_config_t*
// Create a new config object.
struct m_config *
m_config_new(void *optstruct,
int includefunc(struct m_option *conf, char *filename));
/// Free a config object.
void
m_config_free(m_config_t* config);
// Free a config object.
void m_config_free(struct m_config *config);
/// Push a new context.
/** \param config The config object.
/* Push a new context.
* \param config The config object.
*/
void
m_config_push(m_config_t* config);
void m_config_push(struct m_config *config);
/// Pop the current context restoring the previous context state.
/** \param config The config object.
/* Pop the current context restoring the previous context state.
* \param config The config object.
*/
void
m_config_pop(m_config_t* config);
void m_config_pop(struct m_config *config);
/// Register some options to be used.
/** \param config The config object.
/* Register some options to be used.
* \param config The config object.
* \param args An array of \ref m_option struct.
* \return 1 on success, 0 on failure.
*/
int
m_config_register_options(m_config_t *config, const struct m_option *args);
int m_config_register_options(struct m_config *config,
const struct m_option *args);
/// Set an option.
/** \param config The config object.
/* Set an option.
* \param config The config object.
* \param arg The option's name.
* \param param The value of the option, can be NULL.
* \return See \ref OptionParserReturn.
*/
int
m_config_set_option(m_config_t *config, char* arg, char* param);
int m_config_set_option(struct m_config *config, char *arg, char *param);
/// Check if an option setting is valid.
/** \param config The config object.
/* Check if an option setting is valid.
* \param config The config object.
* \param arg The option's name.
* \param param The value of the option, can be NULL.
* \return See \ref OptionParserReturn.
*/
int
m_config_check_option(const m_config_t *config, char *arg, char *param);
int m_config_check_option(const struct m_config *config, char *arg,
char *param);
/// Get the option matching the given name.
/** \param config The config object.
/* Get the option matching the given name.
* \param config The config object.
* \param arg The option's name.
*/
const struct m_option*
m_config_get_option(const m_config_t *config, char *arg);
const struct m_option *m_config_get_option(const struct m_config *config,
char *arg);
/// Print a list of all registered options.
/** \param config The config object.
/* Print a list of all registered options.
* \param config The config object.
*/
void
m_config_print_option_list(const m_config_t *config);
void m_config_print_option_list(const struct m_config *config);
/// \addtogroup ConfigProfiles
///@{
/// Find the profile with the given name.
/** \param config The config object.
/* Find the profile with the given name.
* \param config The config object.
* \param arg The profile's name.
* \return The profile object or NULL.
*/
m_profile_t*
m_config_get_profile(const m_config_t *config, char *name);
struct m_profile *m_config_get_profile(const struct m_config *config,
char *name);
/// Get the profile with the given name, creating it if necessary.
/** \param config The config object.
/* Get the profile with the given name, creating it if necessary.
* \param config The config object.
* \param arg The profile's name.
* \return The profile object.
*/
m_profile_t*
m_config_add_profile(m_config_t* config, char* name);
struct m_profile *m_config_add_profile(struct m_config *config, char *name);
/// Set the description of a profile.
/** Used by the config file parser when defining a profile.
/* Set the description of a profile.
* Used by the config file parser when defining a profile.
*
* \param p The profile object.
* \param arg The profile's name.
*/
void
m_profile_set_desc(m_profile_t* p, char* desc);
void m_profile_set_desc(struct m_profile *p, char *desc);
/// Add an option to a profile.
/** Used by the config file parser when defining a profile.
/* Add an option to a profile.
* Used by the config file parser when defining a profile.
*
* \param config The config object.
* \param p The profile object.
* \param name The option's name.
* \param val The option's value.
*/
int
m_config_set_profile_option(m_config_t* config, m_profile_t* p,
char* name, char* val);
int m_config_set_profile_option(struct m_config *config, struct m_profile *p,
char *name, char *val);
/// Enables profile usage
/** Used by the config file parser when loading a profile.
/* Enables profile usage
* Used by the config file parser when loading a profile.
*
* \param config The config object.
* \param p The profile object.
*/
void
m_config_set_profile(m_config_t* config, m_profile_t* p);
///@}
///@}
void m_config_set_profile(struct m_config *config, struct m_profile *p);
#endif /* MPLAYER_M_CONFIG_H */