summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authoranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-03 14:05:02 +0000
committeranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-03 14:05:02 +0000
commitf8aa18019149a95309e200533d44ffa0f4535789 (patch)
tree57be5e87d1c13d6a13114a203717aecca74a58dd /cfg-mplayer.h
parentcd6307110d8f0cee853678ec14767d3773be93ec (diff)
downloadmpv-f8aa18019149a95309e200533d44ffa0f4535789.tar.bz2
mpv-f8aa18019149a95309e200533d44ffa0f4535789.tar.xz
Commandline interface to ao_plugin updated according to mplayers complex parameter format and plugin pl_format finished (alpha code needs testing)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3280 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 0cc41e3a6d..670616dec6 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -78,6 +78,14 @@ extern float monitor_aspect;
/* from dec_audio, currently used for ac3surround decoder only */
extern int audio_output_channels;
+/* Options related to audio out plugins */
+struct config ao_plugin_conf[]={
+ {"list", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0},
+ {"delay", &ao_plugin_cfg.pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0},
+ {"format", &ao_plugin_cfg.pl_format_type, CONF_TYPE_INT, CONF_MIN, 0, 0},
+ {NULL, NULL, 0, 0, 0, 0}
+};
+
extern int sws_flags;
/*
@@ -101,10 +109,8 @@ struct config conf[]={
{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
- // -----options related to audio and audio plugins-------
{"ao", &audio_driver, CONF_TYPE_STRING, 0, 0, 0},
- {"aop", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0},
- {"aop_delay", &ao_plugin_cfg.pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0},
+ {"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0},
// {"dsp", &dsp, CONF_TYPE_STRING, CONF_NOCFG, 0, 0},
{"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
{"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},