summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure5
-rw-r--r--libmpdemux/demux_lavf.c1
-rw-r--r--libvo/vo_x11.c2
-rw-r--r--libvo/vo_xv.c2
-rw-r--r--libvo/x11_common.c37
-rw-r--r--libvo/x11_common.h2
-rw-r--r--m_config.c810
-rw-r--r--m_config.h227
-rw-r--r--m_option.c177
-rw-r--r--mplayer.c3
-rw-r--r--path.c16
11 files changed, 601 insertions, 681 deletions
diff --git a/configure b/configure
index c2fbb47fe5..8fb2698e70 100755
--- a/configure
+++ b/configure
@@ -2324,6 +2324,7 @@ elif test -z "$CFLAGS" ; then
else
CFLAGS="-O2 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls"
+ ERRORFLAGS="-Werror-implicit-function-declaration"
extra_ldflags="$extra_ldflags -ffast-math"
fi
else
@@ -6655,8 +6656,8 @@ INSTALL = $_install
INSTALLSTRIP = $_install_strip
WINDRES = $_windres
-CFLAGS = $WARNFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags
-CXXFLAGS = $WARNFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags
+CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags
+CXXFLAGS = $WARNFLAGS $ERRORFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags
DEPFLAGS = $DEPFLAGS
CFLAGS_LIBDVDCSS = $cflags_libdvdcss
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 0be7679cd2..efda65a14d 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -42,6 +42,7 @@
#include "libavformat/avio.h"
#include "libavutil/avutil.h"
#include "libavutil/avstring.h"
+#include <libavutil/mathematics.h>
#include "libavcodec/opt.h"
#include "mp_taglists.h"
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 8e34503bb9..9be47c9d8a 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -103,7 +103,7 @@ static void check_events(void)
vo_x11_clearwindow(mDisplay, vo_window);
else if (ret & VO_EVENT_EXPOSE)
vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width,
- myximage->height, 0);
+ myximage->height);
if (ret & VO_EVENT_EXPOSE && int_pause)
flip_page();
}
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index cecbc68b7e..64324c9785 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -187,7 +187,7 @@ static void resize(struct vo *vo)
calc_src_dst_rects(vo, ctx->image_width, ctx->image_height, &ctx->src_rect,
&ctx->dst_rect, NULL, NULL);
struct vo_rect *dst = &ctx->dst_rect;
- vo_x11_clearwindow_part(vo, vo->x11->window, dst->width, dst->height, 1);
+ vo_x11_clearwindow_part(vo, vo->x11->window, dst->width, dst->height);
vo_xv_draw_colorkey(vo, dst->left, dst->top, dst->width, dst->height);
}
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 0a193fb0d3..0ad2a30dd9 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1099,13 +1099,12 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
XSetStandardProperties(mDisplay, x11->window, title, title, None, NULL, 0, &hint);
if (!vo_border) vo_x11_decoration(vo, 0);
// map window
- XMapWindow(mDisplay, x11->window);
- vo_x11_clearwindow(vo, x11->window);
XSelectInput(mDisplay, x11->window, NoEventMask);
- XSync(mDisplay, False);
vo_x11_selectinput_witherr(mDisplay, x11->window,
StructureNotifyMask | KeyPressMask | PointerMotionMask |
ButtonPressMask | ButtonReleaseMask | ExposureMask);
+ XMapWindow(mDisplay, x11->window);
+ vo_x11_clearwindow(vo, x11->window);
}
if (opts->vo_ontop) vo_x11_setlayer(vo, x11->window, opts->vo_ontop);
vo_x11_update_geometry(vo, !geometry_xy_changed);
@@ -1129,18 +1128,17 @@ final:
}
void vo_x11_clearwindow_part(struct vo *vo, Window vo_window,
- int img_width, int img_height, int use_fs)
+ int img_width, int img_height)
{
struct vo_x11_state *x11 = vo->x11;
- struct MPOpts *opts = vo->opts;
Display *mDisplay = vo->x11->display;
int u_dheight, u_dwidth, left_ov, left_ov2;
if (x11->f_gc == None)
return;
- u_dheight = use_fs ? opts->vo_screenheight : vo->dheight;
- u_dwidth = use_fs ? opts->vo_screenwidth : vo->dwidth;
+ u_dheight = vo->dheight;
+ u_dwidth = vo->dwidth;
if ((u_dheight <= img_height) && (u_dwidth <= img_width))
return;
@@ -2302,7 +2300,6 @@ int vo_xv_init_colorkey(struct vo *vo)
void vo_xv_draw_colorkey(struct vo *vo, int32_t x, int32_t y,
int32_t w, int32_t h)
{
- struct MPOpts *opts = vo->opts;
struct vo_x11_state *x11 = vo->x11;
if( x11->xv_ck_info.method == CK_METHOD_MANUALFILL ||
x11->xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow()
@@ -2312,30 +2309,6 @@ void vo_xv_draw_colorkey(struct vo *vo, int32_t x, int32_t y,
x, y,
w, h );
}
-
- /* draw black bars if needed */
- /* TODO! move this to vo_x11_clearwindow_part() */
- if ( vo_fs )
- {
- XSetForeground(x11->display, x11->vo_gc, 0 );
- /* making non-overlap fills, requires 8 checks instead of 4 */
- if ( y > 0 )
- XFillRectangle(x11->display, x11->window, x11->vo_gc,
- 0, 0,
- opts->vo_screenwidth, y);
- if (x > 0)
- XFillRectangle(x11->display, x11->window, x11->vo_gc,
- 0, 0,
- x, opts->vo_screenheight);
- if (x + w < opts->vo_screenwidth)
- XFillRectangle(x11->display, x11->window, x11->vo_gc,
- x + w, 0,
- opts->vo_screenwidth, opts->vo_screenheight);
- if (y + h < opts->vo_screenheight)
- XFillRectangle(x11->display, x11->window, x11->vo_gc,
- 0, y + h,
- opts->vo_screenwidth, opts->vo_screenheight);
- }
}
/** \brief Tests if a valid argument for the ck suboption was given. */
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index ba3d0e2617..ab5188159c 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -137,7 +137,7 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis,
int x, int y, unsigned int width, unsigned int height, int flags,
Colormap col_map, const char *classname, const char *title);
void vo_x11_clearwindow_part(struct vo *vo, Window vo_window,
- int img_width, int img_height, int use_fs);
+ int img_width, int img_height);
void vo_x11_clearwindow(struct vo *vo, Window vo_window);
void vo_x11_ontop(struct vo *vo);
void vo_x11_border(struct vo *vo);
diff --git a/m_config.c b/m_config.c
index 914bfcecb7..47e893717c 100644
--- a/m_config.c
+++ b/m_config.c
@@ -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,457 @@ 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;
-
- 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;
-
- return config;
+ 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, 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;
}
-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);
+ if (copt->opt->type->flags & M_OPT_TYPE_DYNAMIC) {
+ void *ptr = m_option_get_ptr(copt->opt, config->optstruct);
+ if (ptr)
+ m_option_free(copt->opt, ptr);
+ }
+ 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;
- }
-
- mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config pushed level is now %d\n",config->lvl);
+ 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);
}
-void
-m_config_pop(m_config_t* config) {
- m_config_option_t *co;
- m_config_save_slot_t *slot;
-
-#ifdef MP_DEBUG
- assert(config != NULL);
- assert(config->lvl > 1);
-#endif
-
- 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);
-
- 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++;
+void m_config_pop(struct m_config *config)
+{
+ struct m_config_option *co;
+ struct m_config_save_slot *slot;
+
+ 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_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++;
+ }
+ 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;
-
-#ifdef MP_DEBUG
- assert(config != NULL);
- assert(config->lvl > 0);
- assert(arg != NULL);
-#endif
-
- // Allocate a new entry for this option
- co = talloc_zero_size(config, sizeof(m_config_option_t) + 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;
-
- // 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);
+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;
+
+ assert(config != NULL);
+ assert(config->lvl > 0);
+ assert(arg != NULL);
+
+ // 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;
+
+ // 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;
+ }
+ }
+ }
+ 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);
}
- 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);
}
- }
- 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;
-
- 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 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]);
+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;
+
+ assert(config != NULL);
+ assert(config->lvl > 0);
+ assert(arg != NULL);
+
+ co = m_config_get_co(config, arg);
+ if (!co) {
+ return M_OPT_UNKNOWN;
}
- 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;
- }
+ // 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;
+ }
+ }
+ talloc_free(lst[2 * i]);
+ talloc_free(lst[2 * i + 1]);
+ }
+ talloc_free(lst);
+ } else
+ r = m_option_parse(co->opt, arg, param, set ? co->slots->data : NULL,
+ config->mode);
- return r;
+ // 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) {