summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 19:34:42 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 19:34:42 +0000
commit0fdaa5ab30c0da6f9005a72e8e35b2c6cba00a49 (patch)
tree1d308edf5b4ea2f233e8dc4a837dae55774d152a /cfg-mplayer.h
parentbd6b315f6b18dbb67ce11a4909bda4ef01d0fedd (diff)
downloadmpv-0fdaa5ab30c0da6f9005a72e8e35b2c6cba00a49.tar.bz2
mpv-0fdaa5ab30c0da6f9005a72e8e35b2c6cba00a49.tar.xz
Do not use audio plugins anymore
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14255 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 17b681dba8..311090714c 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -122,18 +122,6 @@ extern int nortc;
/* from libvo/aspect.c */
extern float monitor_aspect;
-/* Options related to audio out plugins */
-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},
- {"fout", &ao_plugin_cfg.pl_resample_fout, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
- {"volume", &ao_plugin_cfg.pl_volume_volume, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
- {"mul", &ao_plugin_cfg.pl_extrastereo_mul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL},
- {"softclip", &ao_plugin_cfg.pl_volume_softclip, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
-};
-
extern int sws_flags;
extern int readPPOpt(void *conf, char *arg);
extern void revertPPOpt(void *conf, char* opt);
@@ -166,7 +154,7 @@ m_option_t mplayer_opts[]={
{"noontop", &vo_ontop, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ {"aop", "-aop is deprecated, use -af instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 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},
{"mixer-channel", &mixer_channel, CONF_TYPE_STRING, 0, 0, 0, NULL},