X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fmpfire%2Fmpd.conf;h=d66481ecfdd6ef7ad33755a70876961f0b637f01;hp=b5ab704e721ce9f14892e5c00b936d5597ca9d6c;hb=5ed864857a0e72bd5ef609d5a3ff8eb3df0a8ab1;hpb=9a6214e02721a4bc9cbef8b6531b972afd1d7602

diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
index b5ab704e72..d66481ecfd 100644
--- a/config/mpfire/mpd.conf
+++ b/config/mpfire/mpd.conf
@@ -4,10 +4,9 @@
 
 ##################### REQUIRED ###########################
 port "6600"
-music_directory "/"
+music_directory "/var/mp3"
 playlist_directory "/var/ipfire/mpfire"
 log_file "/var/log/mpd.log"
-error_file "/var/log/mpd.error.log"
 pid_file "/var/run/mpd.pid"
 ##########################################################
 
@@ -32,61 +31,41 @@ state_file "/var/ipfire/mpfire/mpd_state"
 #
 ##########################################################
 
-
-################### VOLUME MIXER #########################
-#
-# Examples:
-# ALSA Mixer 
-mixer_type		"alsa"
-mixer_device		"default"
-mixer_control		"PCM"
-#
-# OSS Mixer
-#mixer_type		"oss"
-#mixer_device 		"/dev/mixer"
-#mixer_control		"PCM"
-#
-# Software Mixer
-#mixer_type		"software"
-#
-##########################################################
-
-
 ################## AUDIO OUTPUT ##########################
 #
 audio_output {
         type                    "alsa"
         name                    "alsa"
-        device                  "hw:0,0"     # optional
-        format                  "44100:16:2" # optional
+#        device                  "hw:0,0"     # optional
+#        format                  "44100:16:2" # optional
 }
 #
 # An example of an OSS output:
 #
-audio_output {
-        type                    "oss"
-        name                    "My OSS Device"
-        device                  "/dev/dsp"   # optional
-        format                  "44100:16:2" # optional
-}
+#audio_output {
+#        type                    "oss"
+#        name                    "My OSS Device"
+#        device                  "/dev/dsp"   # optional
+#        format                  "44100:16:2" # optional
+#}
 #
 # An example of a shout output (for streaming to Icecast):
 #
-audio_output {
-        type                    "shout"
-        name                    "My Shout Stream"
-        host                    "localhost"
-        port                    "8000"
-        mount                   "/mpd.ogg"
-        password                "hackme"
+#audio_output {
+#        type                    "shout"
+#        name                    "My Shout Stream"
+#        host                    "localhost"
+#        port                    "8000"
+#        mount                   "/mpd.ogg"
+#        password                "hackme"
 #        quality                 "5.0"
-        bitrate                 "128"
-        format                  "44100:16:1"
+#        bitrate                 "128"
+#        format                  "44100:16:1"
 #        user                    "source"                # optional
 #        description             "My Stream Description" # optional
 #        genre                   "jazz"                  # optional
 #        public                  "no"                    # optional
-}
+#}
 #
 # Set this if you have problems 
 # playing audio files.