Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / config / mpfire / mpd.conf

diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
index ae2460c223f4fdf84b31fa2781531614a47a701c..10da064c30a7f447f5b8715737be4fae394ffb1f 100644 (file)
--- a/config/mpfire/mpd.conf
+++ b/config/mpfire/mpd.conf
@@ -32,26 +32,6 @@ 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 {