aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <david.runge@frqrec.com>2014-09-28 02:43:06 +0200
committerDavid Runge <david.runge@frqrec.com>2014-09-28 02:43:06 +0200
commit15759da63d60eb88119ccd716d319eeb6ad68e06 (patch)
tree602e1a4ea9d76ac8a1e353aca23b7d2fec05233e
parentc02266013f6e4238f861100f8b9f5c19e604d08d (diff)
downloaddotfiles-15759da63d60eb88119ccd716d319eeb6ad68e06.tar.gz
dotfiles-15759da63d60eb88119ccd716d319eeb6ad68e06.tar.bz2
dotfiles-15759da63d60eb88119ccd716d319eeb6ad68e06.tar.xz
dotfiles-15759da63d60eb88119ccd716d319eeb6ad68e06.zip
Splitting settings for external server into separate config file.
-rw-r--r--.config/mpd/mpd-s4.conf32
-rw-r--r--.config/mpd/mpd.conf22
2 files changed, 41 insertions, 13 deletions
diff --git a/.config/mpd/mpd-s4.conf b/.config/mpd/mpd-s4.conf
new file mode 100644
index 0000000..831cfc9
--- /dev/null
+++ b/.config/mpd/mpd-s4.conf
@@ -0,0 +1,32 @@
+
+music_directory "/home/dave/.config/mpd/folders"
+playlist_directory "/home/dave/.config/mpd/playlists"
+db_file "/home/dave/.config/mpd/mpd.db"
+log_file "/home/dave/.config/mpd/mpd.log"
+pid_file "/home/dave/.config/mpd/mpd.pid"
+state_file "/home/dave/.config/mpd/mpdstate"
+bind_to_address "127.0.0.1"
+port "6600"
+gapless_mp3_playback "yes"
+save_absolute_paths_in_playlists "yes"
+#zeroconf_enabled "yes"
+#zeroconf_name "dvzrv mpd"
+
+input {
+ plugin "curl"
+}
+
+audio_output {
+ type "pulse"
+ name "mpd"
+ mixer_type "software"
+ server "s4" #optional
+}
+
+audio_output {
+ type "fifo"
+ name "mpd_fifo"
+ path "/tmp/mpd.fifo"
+ format "44100:16:2"
+}
+
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index aa1a2a6..6d0a20d 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -4,8 +4,7 @@ db_file "/home/dave/.config/mpd/mpd.db"
log_file "/home/dave/.config/mpd/mpd.log"
pid_file "/home/dave/.config/mpd/mpd.pid"
state_file "/home/dave/.config/mpd/mpdstate"
-#bind_to_address "127.0.0.1"
-bind_to_address "::"
+bind_to_address "127.0.0.1"
port "6600"
gapless_mp3_playback "yes"
save_absolute_paths_in_playlists "yes"
@@ -17,19 +16,16 @@ input {
}
audio_output {
- type "pulse"
- name "mpd"
- mixer_type "software"
-# server "127.0.0.1"
- server "s4" #optional
-# sink "alsa_input.pci-0000_00_08.0.analog-stereo"
-# sink "alsa_output.pci-0000_00_1b.0.analog-stereo"
+ type "pulse"
+ name "mpd"
+ mixer_type "software"
+ server "127.0.0.1"
}
audio_output {
- type "fifo"
- name "mpd_fifo"
- path "/tmp/mpd.fifo"
- format "44100:16:2"
+ type "fifo"
+ name "mpd_fifo"
+ path "/tmp/mpd.fifo"
+ format "44100:16:2"
}