[WIP] Push all of the ultrahaptics changes!

[dotfiles.git] / mpd / mpd.conf.orig

diff --git a/mpd/mpd.conf.orig b/mpd/mpd.conf.orig
new file mode 100644 (file)
index 0000000..d53f829
--- /dev/null
+++ b/mpd/mpd.conf.orig
@@ -0,0 +1,30 @@
+# An example configuration file for MPD can be found at:
+# /usr/share/doc/mpd/
+
+bind_to_address     "any"
+music_directory     "~/music"
+playlist_directory  "~/.local/share/mpd/playlists"
+db_file             "~/.local/share/mpd/database"
+log_file            "~/.local/share/mpd/log"
+pid_file            "~/.local/share/mpd/pid"
+state_file          "~/.local/share/mpd/state"
+sticker_file        "~/.local/share/mpd/sticker.sql"
+
+<<<<<<< Updated upstream
+=======
+# input {
+#     plugin "curl"
+# }
+
+>>>>>>> Stashed changes
+audio_output {
+    type "pulse"
+    name "My Pulse Output"
+}
+
+audio_output {
+    type "fifo"
+    name "fifo"
+    path "/tmp/mpd.fifo"
+    format "44100:16:2"
+}