aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-03-12 04:06:16 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-03-12 04:06:16 +0000
commit44f802a74d273724f0239df47009d2b7e32ef0fa (patch)
treea7a92c523aa41b0abade840a57567c666d0a9389 /doc
parent0afc94e42605b21a92a5fd34559d69a5e769cedd (diff)
downloadmpd-44f802a74d273724f0239df47009d2b7e32ef0fa.tar.gz
mpd-44f802a74d273724f0239df47009d2b7e32ef0fa.tar.xz
mpd-44f802a74d273724f0239df47009d2b7e32ef0fa.zip
update config file
git-svn-id: https://svn.musicpd.org/mpd/trunk@3060 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'doc')
-rw-r--r--doc/mpdconf.example19
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 4d4b19827..0b37d9f9a 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -17,27 +17,28 @@ pid_file "~/.mpd/mpd.pid"
################## AUDIO OUTPUT ##########################
#
-# libao (ao_driver) supports any of the following:
-# Refer to libao documentation for more information
-#
-audio_output {
-# Use default settings
- type "ao"
- name "default ao output"
-#
# use this if you want to use OSS audio output
+#audio_output {
# type "oss"
# name "my OSS sound card"
# device "/dev/dsp" # optional
# format "44100:16:2" #optional
+#}
#
# use this if you want to use ALSA audio output
+#audio_output {
# type "alsa"
# name "my ALSA device"
# device "hw:0,0" # optional
# format "44100:16:2" #optional
+#}
+#
+# as a last resort, try using libao
+#audio_output {
+# type "ao"
+# name "default ao output"
+#}
#
-} # end of audio_output "ao"
#
# Set this if you have problems
# playing audio files.