merge mpd configs

1 files changed, 23 insertions, 10 deletions

diff --git a/.mpdconf b/.mpdconf
index 497483e6..2a82dc0e 100644
--- a/.mpdconf
+++ b/.mpdconf
@@ -1,3 +1,5 @@
+# -*- mode: conf-space; -*-
+
 music_directory		"/home/swhitton/lib/annex/music"
 playlist_directory		"/home/swhitton/doc/playlists"
 db_file			"/home/swhitton/local/mpd/database"
@@ -7,16 +9,27 @@ state_file			"/home/swhitton/local/mpd/state"
 sticker_file                   "/home/swhitton/local/mpd/sticker.sql"
 bind_to_address		"localhost"
 
-# An example of a pulseaudio output (streaming to a remote pulseaudio server)
-# Please see README.Debian if you want mpd to play through the pulseaudio
-# daemon started as part of your graphical desktop session!
-#
-#audio_output {
-#	type		"pulse"
-#	name		"My Pulse Output"
-#	server		"remote_server"		# optional
-#	sink		"remote_server_sink"	# optional
-#}
+# This audio output should match the default one that running mpd on
+# Xfce startup adds.  We have it here explicitly because adding the
+# HTTP stream output below disables adding the default output
+audio_output {
+	type		"pulse"
+	name		"My Pulse Output"
+	#server		"remote_server"		# optional
+	#sink		"remote_server_sink"	# optional
+}
+
+# HTTP stream to LAN
+audio_output {
+       type            "httpd"
+       name            "Sean's music stream"
+       encoder         "lame"
+       port            "8000"
+       bind_to_address "192.168.1.236"
+       bitrate         "128"
+       format          "44100:16:1"
+       max_clients     "1"
+}
 
 filesystem_charset		"UTF-8"
 id3v1_encoding			"UTF-8"