summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-13 16:29:32 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-13 16:29:32 +0000
commit2283b6305f9a9d0d287705348f8ee9d1333caa99 (patch)
tree22bcfcb52ed464003c938bedf2193f0681cdf78c /cfg-mplayer.h
parent7dadaf5e397fd9bbf7e813ee8226636b79eca78a (diff)
downloadmpv-2283b6305f9a9d0d287705348f8ee9d1333caa99.tar.bz2
mpv-2283b6305f9a9d0d287705348f8ee9d1333caa99.tar.xz
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
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 08c93e7281..4dfca1af6a 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -86,17 +86,17 @@ extern char **vo_fstype_list;
#endif
#ifdef HAVE_AA
-extern int vo_aa_parseoption(struct config * conf, char *opt, char * param);
-extern void vo_aa_revertoption(config_t* opt,char* param);
+extern int vo_aa_parseoption(m_option_t* conf, char *opt, char * param);
+extern void vo_aa_revertoption(m_option_t* opt,char* param);
#endif
#ifdef HAVE_ZR
-extern int vo_zr_parseoption(struct config * conf, char *opt, char * param);
-extern void vo_zr_revertoption(config_t* opt,char* pram);
+extern int vo_zr_parseoption(m_option_t* conf, char *opt, char * param);
+extern void vo_zr_revertoption(m_option_t* opt,char* pram);
#endif
#ifdef HAVE_DXR2
-extern config_t dxr2_opts[];
+extern m_option_t dxr2_opts[];
#endif
#ifdef STREAMING_LIVE_DOT_COM
@@ -126,7 +126,7 @@ extern int nortc;
extern float monitor_aspect;
/* Options related to audio out plugins */
-struct config ao_plugin_conf[]={
+m_option_t ao_plugin_conf[]={
{"list", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"delay", &ao_plugin_cfg.pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
{"format", &ao_plugin_cfg.pl_format_type, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
@@ -138,7 +138,7 @@ struct config ao_plugin_conf[]={
};
#ifdef HAVE_JPEG
-struct config jpeg_conf[]={
+m_option_t jpeg_conf[]={
{"progressive", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noprogressive", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"baseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -169,7 +169,7 @@ extern char* pp_help;
* by Folke
*/
-static config_t mplayer_opts[]={
+m_option_t mplayer_opts[]={
/* name, pointer, type, flags, min, max */
{"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this don't need anymore to be the first!!! */