From 2283b6305f9a9d0d287705348f8ee9d1333caa99 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 13 Aug 2003 16:29:32 +0000 Subject: Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2 --- m_option.h | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to 'm_option.h') diff --git a/m_option.h b/m_option.h index fcec246482..30f912eafb 100644 --- a/m_option.h +++ b/m_option.h @@ -1,7 +1,5 @@ - -#ifndef NEW_CONFIG -#warning "Including m_option.h but NEW_CONFIG is disabled" -#else +#ifndef _M_OPTION_H +#define _M_OPTION_H typedef struct m_option_type m_option_type_t; typedef struct m_option m_option_t; @@ -76,25 +74,25 @@ typedef struct { extern m_obj_params_t m_span_params_def; -// Don't be stupid keep tho old names ;-) +// FIXME: backward compatibility #define CONF_TYPE_FLAG (&m_option_type_flag) #define CONF_TYPE_INT (&m_option_type_int) #define CONF_TYPE_FLOAT (&m_option_type_float) -#define CONF_TYPE_STRING (&m_option_type_string) +#define CONF_TYPE_STRING (&m_option_type_string) #define CONF_TYPE_FUNC (&m_option_type_func) #define CONF_TYPE_FUNC_PARAM (&m_option_type_func_param) #define CONF_TYPE_PRINT (&m_option_type_print) #define CONF_TYPE_PRINT_INDIRECT (&m_option_type_print_indirect) #define CONF_TYPE_FUNC_FULL (&m_option_type_func_full) #define CONF_TYPE_SUBCONFIG (&m_option_type_subconfig) -#define CONF_TYPE_STRING_LIST (&m_option_type_string_list) +#define CONF_TYPE_STRING_LIST (&m_option_type_string_list) #define CONF_TYPE_POSITION (&m_option_type_position) -#define CONF_TYPE_IMGFMT (&m_option_type_imgfmt) +#define CONF_TYPE_IMGFMT (&m_option_type_imgfmt) #define CONF_TYPE_SPAN (&m_option_type_span) #define CONF_TYPE_OBJ_SETTINGS_LIST (&m_option_type_obj_settings_list) -#define CONF_TYPE_OBJ_PRESETS (&m_option_type_obj_presets) -#define CONF_TYPE_CUSTOM_URL (&m_option_type_custom_url) -#define CONF_TYPE_OBJ_PARAMS (&m_option_type_obj_params) +#define CONF_TYPE_OBJ_PRESETS (&m_option_type_obj_presets) +#define CONF_TYPE_CUSTOM_URL (&m_option_type_custom_url) +#define CONF_TYPE_OBJ_PARAMS (&m_option_type_obj_params) ///////////////////////////////////////////////////////////////////////////////////////////// @@ -126,9 +124,6 @@ struct m_option_type { void (*free)(void* dst); }; -/// This is the same thing as a struct config it have been renamed -/// to remove this config_t, m_config_t mess. Sorry about that, -/// config_t is still provided for backward compat. struct m_option { char *name; void *p; @@ -161,6 +156,16 @@ struct m_option { // Emulate old behaviour by pushing the option only if it was set by the user #define M_OPT_OLD (1<<6) +// FIXME: backward compatibility +#define CONF_MIN M_OPT_MIN +#define CONF_MAX M_OPT_MAX +#define CONF_RANGE M_OPT_RANGE +#define CONF_NOCFG M_OPT_NOCFG +#define CONF_NOCMD M_OPT_NOCMD +#define CONF_GLOBAL M_OPT_GLOBAL +#define CONF_NOSAVE M_OPT_NOSAVE +#define CONF_OLD M_OPT_OLD + ///////////////////////////// Option type flags /////////////////////////////////// @@ -206,9 +211,15 @@ struct m_option { #define M_OPT_MISSING_PARAM -2 #define M_OPT_INVALID -3 #define M_OPT_OUT_OF_RANGE -4 -#define M_OPT_PARSER_ERR -5 +#define M_OPT_PARSER_ERR -5 #define M_OPT_EXIT -6 +// FIXME: backward compatibility +#define ERR_NOT_AN_OPTION M_OPT_UNKNOWN +#define ERR_MISSING_PARAM M_OPT_MISSING_PARAM +#define ERR_OUT_OF_RANGE M_OPT_OUT_OF_RANGE +#define ERR_FUNC_ERR M_OPT_PARSER_ERR + m_option_t* m_option_list_find(m_option_t* list,char* name); inline static int @@ -250,4 +261,4 @@ m_option_free(m_option_t* opt,void* dst) { opt->type->free(dst); } -#endif +#endif /* _M_OPTION_H */ -- cgit v1.2.3