diff options
| -rw-r--r-- | cfg-common.h | 11 | ||||
| -rw-r--r-- | cfg-mplayer.h | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/cfg-common.h b/cfg-common.h index d668a26096..49cfdd6670 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -121,6 +121,9 @@ {"sound", &audio_id, CONF_TYPE_FLAG, 0, -2, -1, NULL}, {"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, + {"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + // select audio/video codec (by name) or codec family (by number): // {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync // {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c @@ -341,6 +344,14 @@ struct config mfopts_conf[]={ extern char** vo_plugin_args; +#include "libaf/af.h" +extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c +struct config audio_filter_conf[]={ + {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} +}; + #ifdef USE_LIBAVCODEC extern struct config lavc_decode_opts_conf[]; #endif diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 393c1ad388..bfb6eea704 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -126,14 +126,6 @@ extern int nortc; /* from libvo/aspect.c */ extern float monitor_aspect; -#include "libaf/af.h" -extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c -struct config audio_filter_conf[]={ - {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, - {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - /* Options related to audio out plugins */ struct config ao_plugin_conf[]={ {"list", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -190,8 +182,6 @@ static config_t mplayer_opts[]={ {"fixed-vo", &fixed_vo, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |