aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/mpd.conf.520
1 files changed, 14 insertions, 6 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 6a5336e92..06f675131 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -186,14 +186,14 @@ This specifies whether relative or absolute paths for song filenames are used
when saving playlists. The default is "no".
.SH REQUIRED AUDIO OUTPUT PARAMETERS
.TP
-.B name <name>
-This specifies a unique name for the audio output.
-.TP
.B type <type>
This specifies the audio output type. Depending on what audio output support
-mpd was built with possible values could be "alsa", "oss", "osx", "mvp", "ao",
-or "shout" (see \fBREQUIRED SHOUT OUTPUT PARAMETERS\fP and \fBOPTIONAL SHOUT
-OUTPUT PARAMETERS\fP).
+mpd was built with possible values could be "alsa", "oss", "osx", "pulse",
+"mvp", "ao", or "shout" (see \fBREQUIRED SHOUT OUTPUT PARAMETERS\fP and
+\fBOPTIONAL SHOUT OUTPUT PARAMETERS\fP).
+.TP
+.B name <name>
+This specifies a unique name for the audio output.
.SH OPTIONAL AUDIO OUTPUT PARAMETERS
.TP
.B format <sample_rate:bits:channels>
@@ -207,6 +207,14 @@ This specifies the device to use for audio output. Used by the alsa and oss
output types. The default for oss is "/dev/dsp"; the default for alsa is
"hw:0,0".
.TP
+.B server <server list>
+A space separated list of servers to try to connect to. Used only by the pulse
+audio output. The default is to let PulseAudio choose a server.
+.TP
+.B sink <sink>
+The sink to output to. Used only by the pulse audio output. The default is to
+let PulseAudio choose a sink.
+.TP
.B driver <driver>
This specifies the libao driver to use for audio output. Used only by the ao
output type. Possible values depend on what libao drivers are available. See