diff options
| author | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-25 13:31:26 +0000 |
|---|---|---|
| committer | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-25 13:31:26 +0000 |
| commit | 330d33256f51e049ee93458b43cef557a8a96f7e (patch) | |
| tree | f2ce84ccba67afdef2672aa17c1923a6481ed368 /cfg-mplayer.h | |
| parent | 4b6f1667dbc44aebfae5de7d92ae5b8a2095c243 (diff) | |
| download | mpv-330d33256f51e049ee93458b43cef557a8a96f7e.tar.bz2 mpv-330d33256f51e049ee93458b43cef557a8a96f7e.tar.xz | |
Adding SW volume control
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4860 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 0c9d686edb..a85515025e 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -106,6 +106,7 @@ struct config ao_plugin_conf[]={ {"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}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -141,7 +142,7 @@ static config_t mplayer_opts[]={ // {"dsp", &dsp, CONF_TYPE_STRING, 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}, - {"master", "Option -master was obsolete and has been removed\n" , CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 2, 6, NULL}, #ifdef HAVE_X11 {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL}, |