aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpdconf.example
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-09-10 23:18:43 +0200
committerMax Kellermann <max@duempel.org>2009-09-10 23:18:43 +0200
commitfdc479676f7f39d33287111900f0862ddb7797af (patch)
tree9b77638e323b14e8b5cba3fd002ac2d7c580e06a /doc/mpdconf.example
parent4cdf62000c2d5403f0dc5a5078719c2d63d268c7 (diff)
parent985b8b2d7159a47d1dd1d3604d6b8f6edc94d2e7 (diff)
downloadmpd-fdc479676f7f39d33287111900f0862ddb7797af.tar.gz
mpd-fdc479676f7f39d33287111900f0862ddb7797af.tar.xz
mpd-fdc479676f7f39d33287111900f0862ddb7797af.zip
Merge branch 'v0.15.x'
Conflicts: NEWS configure.ac doc/mpdconf.example
Diffstat (limited to 'doc/mpdconf.example')
-rw-r--r--doc/mpdconf.example44
1 files changed, 22 insertions, 22 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 8ce3a1b9f..2d2732869 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -184,12 +184,12 @@ input {
#audio_output {
# type "alsa"
# name "My ALSA Device"
-# device "hw:0,0" # optional
-# format "44100:16:2" # optional
-# mixer_type "hardware" # optional
-# mixer_device "default" # optional
-# mixer_control "PCM" # optional
-# mixer_index "0" # optional
+## device "hw:0,0" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "default" # optional
+## mixer_control "PCM" # optional
+## mixer_index "0" # optional
#}
#
# An example of an OSS output:
@@ -197,11 +197,11 @@ input {
#audio_output {
# type "oss"
# name "My OSS Device"
-# device "/dev/dsp" # optional
-# format "44100:16:2" # optional
-# mixer_type "hardware" # optional
-# mixer_device "/dev/mixer" # optional
-# mixer_control "PCM" # optional
+## device "/dev/dsp" # optional
+## format "44100:16:2" # optional
+## mixer_type "hardware" # optional
+## mixer_device "/dev/mixer" # optional
+## mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):
@@ -217,13 +217,13 @@ input {
# quality "5.0"
# bitrate "128"
# format "44100:16:1"
-# protocol "icecast2" # optional
-# user "source" # optional
-# description "My Stream Description" # optional
-# genre "jazz" # optional
-# public "no" # optional
-# timeout "2" # optional
-# mixer_type "software" # optional
+## protocol "icecast2" # optional
+## user "source" # optional
+## description "My Stream Description" # optional
+## genre "jazz" # optional
+## public "no" # optional
+## timeout "2" # optional
+## mixer_type "software" # optional
#}
#
# An example of a recorder output:
@@ -233,7 +233,7 @@ input {
# name "My recorder"
# encoder "vorbis" # optional, vorbis or lame
# path "/var/lib/mpd/recorder/mpd.ogg"
-# quality "5.0" # do not define if bitrate is defined
+## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
#}
@@ -245,7 +245,7 @@ input {
# name "My HTTP Stream"
# encoder "vorbis" # optional, vorbis or lame
# port "8000"
-# quality "5.0" # do not define if bitrate is defined
+## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
#}
@@ -255,8 +255,8 @@ input {
#audio_output {
# type "pulse"
# name "My Pulse Output"
-# server "remote_server" # optional
-# sink "remote_server_sink" # optional
+## server "remote_server" # optional
+## sink "remote_server_sink" # optional
#}
#
## Example "pipe" output: