aboutsummaryrefslogtreecommitdiffstats
path: root/.config/mpd
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2016-08-16 16:05:08 +0200
committerDavid Runge <dave@sleepmap.de>2016-08-16 16:05:08 +0200
commit5398090beb583efb86717010f90ebdf2552c4b94 (patch)
treea550fa866f8ba0c66296888031298582ff3781d3 /.config/mpd
parenta24212e200da85e91c20d3f7c6631a19b4bab04f (diff)
parent30d3a2fdefce354b65019226ba1762b0403b8439 (diff)
downloaddotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.gz
dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.bz2
dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.xz
dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.zip
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles: (28 commits) .config/qtile/config.py: Disabling broken TreeTab layout. Adding scide to dev. Changing background picture to lowercase. Enabling notification widget. .zsh.after/aliases.zsh: Adding automatic selection of audio backends for mpv. bin/set_volume: Adding further increase/decrease shortcuts. .scvimrc: Adding system runtimepath for .sc files. .config/mpd/mpd-trvlr-jack.conf: Adding mpd configuration for trvlr using JACK. .config/mpd/mpd-trvlr.conf: Adding mpd configuration for trlvr. .config/mpd/mpd.conf: Switching audio backend to JACK in default mpd config. .config/conky/side: Removing broken xft settings. .config/compton.conf .config/SuperCollider/startupfiles/rme_fireface800.scd: Removing obsolete configurations. .config/SuperCollider/startup.scd: Adding a generic startupFile for SuperCollider. .gitignore: Unignoring SuperCollider's startup file. .processing/preferences.txt: Removing configuration due to constant regneration and metadata leakage. .config/patchagerc: Removing useless configuration. .config/SuperCollider/sc_ide_conf.yaml: Removing redundant sc_ide_conf.yaml. .arduino/preferences.txt: Removing arduino preferences due to redundancy. .scvimrc: Using horizontal split in tmux. Removing old trash from ftplugin identifiers. Using SClangStart only on scd files. .config/gtk-3.0/gtk.css: Adding css to disable double drawing of menus/title bars and client-side decoration. .config/compton.conf: Disabling fading (too slow). Lowering shadow-radius, so it won't interfere with WM bars. .vdirsyncer/config: Adding 'b wins' conflict_resolution for akt. ...
Diffstat (limited to '.config/mpd')
-rw-r--r--.config/mpd/mpd-trvlr-jack.conf30
-rw-r--r--.config/mpd/mpd-trvlr.conf30
-rw-r--r--.config/mpd/mpd.conf2
3 files changed, 61 insertions, 1 deletions
diff --git a/.config/mpd/mpd-trvlr-jack.conf b/.config/mpd/mpd-trvlr-jack.conf
new file mode 100644
index 0000000..7f4f9bb
--- /dev/null
+++ b/.config/mpd/mpd-trvlr-jack.conf
@@ -0,0 +1,30 @@
+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 "jack"
+ name "mpd"
+ mixer_type "software"
+}
+
+audio_output {
+ type "fifo"
+ name "mpd_fifo"
+ path "/run/user/1000/mpd/fifo"
+ format "44100:16:2"
+}
+
diff --git a/.config/mpd/mpd-trvlr.conf b/.config/mpd/mpd-trvlr.conf
new file mode 100644
index 0000000..294d26a
--- /dev/null
+++ b/.config/mpd/mpd-trvlr.conf
@@ -0,0 +1,30 @@
+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"
+}
+
+audio_output {
+ type "fifo"
+ name "mpd_fifo"
+ path "/run/user/1000/mpd/fifo"
+ format "44100:16:2"
+}
+
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 294d26a..7f4f9bb 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -16,7 +16,7 @@ input {
}
audio_output {
- type "pulse"
+ type "jack"
name "mpd"
mixer_type "software"
}