Audio plugins have been removed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14442 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 1 insertions, 228 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 076b285dab..6bb3870d70 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1671,30 +1671,6 @@ Specify the VOBsub subtitle ID.
 Override audio driver/\:card buffer size detection.
 .
 .TP
-.B \-aop <list=plugin1,plugin2...:option1=value1:opt2=val2...>
-Specify audio plugin(s) and their options
-(also see the audio plugins section of the documentation).
-.sp 1
-Available options are:
-.RSs
-.IPs list=[plugins]
-comma separated list of plugins (resample, surround, format, volume,
-extrastereo, volnorm, delay)
-.IPs delay=<sec>
-example plugin, do not use (delay plugin only)
-.IPs format=<format>
-output format (format plugin only)
-.IPs fout=<Hz>
-output frequency (resample plugin only)
-.IPs volume=<0\-255>
-volume (volume plugin only)
-.IPs mul=<value>
-stereo coefficient (default: 2.5) (extrastereo plugin only)
-.IPs softclip
-compressor / 'soft-clipping' capabilities (volume plugin only)
-.RE
-.
-.TP
 .B \-delay <sec>
 Audio delay in seconds (positive or negative float value).
 .
diff --git a/DOCS/xml/en/audio.xml b/DOCS/xml/en/audio.xml
index 457549467a..cf1ed82b14 100644
--- a/DOCS/xml/en/audio.xml
+++ b/DOCS/xml/en/audio.xml
@@ -1038,207 +1038,4 @@ Usage:
 
 </sect2>
 
-<sect2 id="audio-plugins">
-<title>Audio plugins (deprecated)</title>
-<note><para><emphasis role="bold">Audio plugins have been deprecated by audio filters and will
-be removed soon.</emphasis></para></note>
-
-<para>
-<application>MPlayer</application> has support for audio plugins.  Audio
-plugins can be used for changing the properties of the audio data before
-the sound reaches the sound card. They are enabled using the
-<option>-aop</option> switch which takes a
-<option>list=plugin1,plugin2,...</option> argument. The
-<option>list</option> argument is required and determines which plugins
-should be used and in which order they should be executed. Example:
-
-<screen>mplayer <replaceable>media.avi</replaceable> -aop list=resample,format</screen>
-
-would run the sound through the resampling plugin followed by the format
-plugin.
-</para>
-
-<para>
-The plugins can also have switches that change their behavior. These
-switches are explained in detail in the sections below. A plugin will
-execute using default settings if its switches are omitted.  Here is an
-example of how to use plugins in combination with plugin specific switches:
-
-<screen>mplayer <replaceable>media.avi</replaceable> -aop list=resample,format:fout=44100:format=0x8</screen>
-
-would set the output frequency of the resample plugin to 44100 Hz and the
-output format of the format plugin to AFMT_U8.
-</para>
-
-<para>
-Currently audio plugins can not be used in
-<application>MEncoder</application>.
-</para>
-
-
-<sect3 id="updn-sampling">
-<title>Up/Downsampling</title>
-
-<para>
-<application>MPlayer</application> fully supports up/downsampling of the sound. This plugin can be
-used if you have a fixed frequency sound card or if you are stuck with an
-old sound card that is only capable of max 44.1 kHz. Limitations in your
-hardware are not auto detected, so you have to specify the sample frequency
-explicitly. This plugin has one switch: <option>fout</option> which is used for setting the
-desired output sample frequency. It defaults to 48 kHz, and is given in
-Hz.
-</para>
-
-<para>
-Usage:
-
-<screen>
-mplayer <replaceable>media.avi</replaceable> -aop list=resample:fout=<replaceable>freq</replaceable></screen>
-
-where <literal><replaceable>freq</replaceable></literal> is the frequency
-in Hz, like <literal>44100</literal>.
-</para>
-
-<note>
-<para>
-The output frequency should not be scaled up from the default value.
-Scaling up will cause the audio and video streams to be played in slow
-motion in addition to audio distortion.
-</para>
-</note>
-</sect3>
-
-
-<sect3 id="surround-decode">
-<title>Surround Sound decoding</title>
-
-<para>
-<application>MPlayer</application> has an audio plugin that can decode
-matrix encoded surround sound. Dolby Surround is an example of a matrix
-encoded format.  Many files with 2 channel audio actually contain matrixed
-surround sound.  To use this feature you need a sound card supporting at
-least 4 channels.
-</para>
-
-<para>
-Usage:
-<screen>mplayer <replaceable>media.avi</replaceable> -aop list=surround</screen>
-</para>
-</sect3>
-
-
-<sect3 id="sample-format-conv">
-<title>Sample format converter</title>
-
-<para>
-If your sound card driver does not support signed 16-bit int data type,
-this plugin can be used to change the format to one which your sound card
-can understand. It has one switch, <option>format</option>, which can be
-set to one of the numbers found in <filename>libao2/afmt.h</filename>. This
-plugin is hardly ever needed and is intended for advanced users. Keep in
-mind that this plugin only changes the sample format and not the sample
-frequency or the number of channels.
-</para>
-
-<para>
-Usage:
-
-<screen>
-mplayer <replaceable>media.avi</replaceable> -aop list=format:format=<replaceable>outfmt</replaceable></screen>
-
-where <literal><replaceable>outfmt</replaceable></literal> is the
-required output format.
-</para>
-</sect3>
-
-
-<sect3 id="audio-delay">
-<title>Delay</title>
-<para>
-This plugin delays the sound and is intended as an example of how to
-develop new plugins. It can not be used for anything useful from a users
-perspective and is mentioned here for the sake of completeness only. Do not
-use this plugin unless you are a developer.
-</para>
-</sect3>
-
-
-<sect3 id="sw-volume">
-<title>Software volume control</title>
-
-<para>
-This plugin is a software replacement for the volume control, and can be
-used on machines with a broken mixer device. It can also be used if one
-wants to change the output volume of <application>MPlayer</application>
-without changing the PCM volume setting in the mixer. It has one switch
-<option>volume</option> that is used for setting the initial sound level.
-The initial sound level can be set to values between 0 and 255 and defaults
-to 101 which equals 0dB amplification. Use this plugin with caution since
-it can reduce the signal to noise ratio of the sound. In most cases it is
-best to set the level for the PCM sound to max, leave this plugin out and
-control the output level to your speakers with the master volume control of
-the mixer. If there is an external amplifier connected to the computer
-(this is almost always the case), the noise level can be minimized by
-adjusting the master level and the volume knob on the amplifier until the
-hissing noise in the background is gone.
-</para>
-
-<para>
-Usage:
-<screen>
-mplayer <replaceable>media.avi</replaceable> -aop list=volume:volume=<replaceable>0-255</replaceable></screen>
-</para>
-
-<para>
-This plugin also has compressor or "soft-clipping" capabilities.
-Compression can be used if the dynamic range of the sound is very high or
-if the dynamic range of the loudspeakers is very low. Be aware that this
-feature creates distortion and should be considered a last resort.
-</para>
-
-<para>
-Usage:
-<screen>
-mplayer <replaceable>media.avi</replaceable> -aop list=volume:softclip</screen>
-</para>
-</sect3>
-
-<sect3 id="extrastereo">
-<title>Extrastereo</title>
-
-<para>
-This plugin (linearly) increases the difference between left and right
-channels (like the <application>XMMS</application> extrastereo plugin) which gives some
-sort of "live" effect to playback.
-</para>
-
-<para>
-Usage:
-<screen>
-mplayer <replaceable>media.avi</replaceable> -aop list=extrastereo
-mplayer <replaceable>media.avi</replaceable> -aop list=extrastereo:mul=3.45<!--
---></screen>
-
-The default coefficient (<option>mul</option>) is a float number that
-defaults to 2.5. If you set it to <literal>0.0</literal>, you will have
-mono sound (average of both channels). If you set it to
-<literal>1.0</literal>, sound will be unchanged, if you set it to
-<literal>-1.0</literal>, left and right channels will be swapped.
-</para>
-</sect3>
-
-
-<sect3 id="volnorm">
-<title>Volume normalizer</title>
-
-<para>
-This plugin maximizes the volume without distorting the sound.
-</para>
-
-<para>
-Usage:
-<screen>mplayer <replaceable>media.avi</replaceable> -aop list=volnorm</screen>
-</para>
-</sect3>
-</sect2>
 </sect1>
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index 552f7d7149..f074705526 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -2061,7 +2061,7 @@ For audio output, where <replaceable>X</replaceable> is the device number (0 if
 </varlistentry>
 
 <varlistentry>
-<term><option>-aop list=resample:fout=<replaceable>xxxxx</replaceable></option></term>
+<term><option>-af resample=<replaceable>xxxxx</replaceable></option></term>
 <listitem><para>
 The em8300 cannot play back samplerates lower than 44100Hz. If the sample
 rate is below 44100Hz select either 44100Hz or 48000Hz depending on which