From 9526fdbe730edb4b095a1e12aade0e16f1da2292 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 21 Oct 2009 23:01:04 +0200
Subject: audio_format: wildcards allowed in audio_format configuration

An asterisk means that this attribute should not be enforced, and
stays whatever it used to be.  This way, some configuration values
work like masks.
---
 doc/mpd.conf.5 |  4 ++++
 doc/user.xml   | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 0784ea39..6bbd7e78 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -129,6 +129,8 @@ audio that is sent to each audio output.  Note that audio outputs may specify
 their own audio format which will be used for actual output to the audio
 device.  An example is "44100:16:2" for 44100Hz, 16 bits, and 2 channels.  The
 default is to use the audio format of the input file.
+Any of the three attributes may be an asterisk to specify that this
+attribute should not be enforced
 .TP
 .B samplerate_converter <integer or prefix>
 This specifies the libsamplerate converter to use.  The supplied value should
@@ -261,6 +263,8 @@ This specifies the sample rate, bits per sample, and number of channels of
 audio that is sent to the audio output device.  See documentation for the
 \fBaudio_output_format\fP parameter for more details.  The default is to use
 whatever audio format is passed to the audio output.
+Any of the three attributes may be an asterisk to specify that this
+attribute should not be enforced
 .SH OPTIONAL ALSA OUTPUT PARAMETERS
 .TP
 .B device <dev>
diff --git a/doc/user.xml b/doc/user.xml
index ca63eccd..8111482d 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -300,10 +300,19 @@ cd mpd-version</programlisting>
                 <varname>format</varname>
               </entry>
               <entry>
-                Always open the audio output with the specified audio
-                format (samplerate:bits:channels), regardless of the
-                format of the input file.  This is optional for most
-                plugins.
+                <para>
+                  Always open the audio output with the specified audio
+                  format (samplerate:bits:channels), regardless of the
+                  format of the input file.  This is optional for most
+                  plugins.
+                </para>
+                <para>
+                  Any of the three attributes may be an asterisk to
+                  specify that this attribute should not be enforced,
+                  example: <parameter>48000:16:*</parameter>.
+                  <parameter>*:*:*</parameter> is equal to not having
+                  a <varname>format</varname> specification.
+                </para>
               </entry>
             </row>
             <row>
-- 
cgit v1.2.3