From 0ca7a16d5227de40f1324a26e787330ec995d057 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 17 Mar 2020 13:22:31 +0100
Subject: [PATCH] Introduced mpDris2 client for local MPD

---
 install.conf.yaml   |  2 ++
 mpd/mpDris2.conf    | 18 ++++++++++++++++++
 mpd/mpDris2.service | 13 +++++++++++++
 mpd/mpd.conf        | 38 +++++++++++++++++++++++---------------
 ncmpcpp/config      | 10 +++++-----
 5 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 mpd/mpDris2.conf
 create mode 100644 mpd/mpDris2.service

diff --git a/install.conf.yaml b/install.conf.yaml
index 148e175..e34a1a1 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -16,6 +16,8 @@
     ~/.ncmpcpp/config: ncmpcpp/config
     ~/.ncmpcpp/bindings: ncmpcpp/bindings
     ~/.mpd/mpd.conf: mpd/mpd.conf
+    ~/.config/mpDris2/mpDris2.conf: mpd/mpDris2.conf
+    ~/.config/systemd/mpDris2.service: mpd/mpDris2.service
     ~/.profile: profile.sh
     ~/.ssh/config: ssh/config
     ~/.tmux: tmux
diff --git a/mpd/mpDris2.conf b/mpd/mpDris2.conf
new file mode 100644
index 0000000..9ecba1e
--- /dev/null
+++ b/mpd/mpDris2.conf
@@ -0,0 +1,18 @@
+# mpDris2 Configuration
+# Default values are commented out
+
+[Connection]
+# You can also export $MPD_HOST and/or $MPD_PORT to change the server.
+host = ~/.config/mpd/socket
+#port = 6600
+#password =
+
+[Library]
+music_dir = ~/Music
+cover_regex = ^(album|cover|\.?folder|front).*\.(gif|jpeg|jpg|png)$
+
+[Bling]
+mmkeys = True
+notify = False
+# Urgency of the notification: 0 for low, 1 for medium and 2 for high.
+#notify_urgency = 0
diff --git a/mpd/mpDris2.service b/mpd/mpDris2.service
new file mode 100644
index 0000000..69e6c8b
--- /dev/null
+++ b/mpd/mpDris2.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=mpDris2 - Music Player Daemon D-Bus bridge
+Wants=mpd.service
+After=mpd.service
+Requires=dbus.service
+
+[Service]
+Restart=on-failure
+ExecStart=/usr/bin/mpDris2
+BusName=org.mpris.MediaPlayer2.mpd
+
+[Install]
+WantedBy=default.target
diff --git a/mpd/mpd.conf b/mpd/mpd.conf
index 6e37347..bbc5f23 100644
--- a/mpd/mpd.conf
+++ b/mpd/mpd.conf
@@ -1,16 +1,20 @@
 
-# INET binding
-bind_to_address "localhost"
-port				"6600"
+pid_file			"~/.config/mpd/pid"
+state_file			"~/.config/mpd/mpdstate"
+playlist_directory	"~/.config/mpd/playlists"
+sticker_file		"~/.config/mpd/sticker.sql"
+log_file			"~/.config/mpd/log"
 
 # UNIX binding
-bind_to_address "~/.mpd/socket"
+bind_to_address "~/.config/mpd/socket"
+
+# INET binding
+#bind_to_address "localhost"
+#port				"6600"
 
 
-# Select one of the two options
-## Use Local database
-db_file "~/.mpd/database"
-music_directory "~/Music"
+
+# Select one of the two options below
 
 ## Use Remote Database and Files
 #database {
@@ -18,16 +22,20 @@ music_directory "~/Music"
 #	host	"remote"
 #	port	"6600"
 #}
+#music_directory "smb://remote"
+
+### Use Local database
+#db_file "~/.config/mpd/database"
 #music_directory "~/Music"
 
-pid_file "~/.mpd/pid"
-state_file "~/.mpd/mpdstate"
-playlist_directory "~/.mpd/playlists"
-sticker_file			"~/.mpd/sticker.sql"
-log_file			"~/.mpd/log"
+
+# Enable Neighbour plugins
+neighbors {
+	plugin "smbclient"
+}
 
 
-# Audio Outputs
+## Audio Outputs
 audio_output {
 	type "pulse"
 	name "User Pulse Audio"
@@ -38,6 +46,6 @@ audio_output {
 audio_output {
 	type	"fifo"
 	name	"my_fifo"
-	path	"/tmp/mpd.fifo"
+	path	"~/.config/mpd/mpd.fifo"
 	format	"44100:16:2"
 }
diff --git a/ncmpcpp/config b/ncmpcpp/config
index ec38e15..f77dacf 100644
--- a/ncmpcpp/config
+++ b/ncmpcpp/config
@@ -12,7 +12,7 @@
 ## file which defines that while launching ncmpcpp.
 ##
 #
-ncmpcpp_directory = ~/.ncmpcpp
+ncmpcpp_directory = ~/.config/ncmpcpp
 #
 ##
 ## Directory for storing downloaded lyrics. It
@@ -24,7 +24,7 @@ lyrics_directory = ~/.lyrics
 #
 ##### connection settings #####
 #
-mpd_host = locksmith.nm.deboone.nl
+mpd_host = ~/.config/mpd/socket
 #
 mpd_port = 6600
 #
@@ -52,7 +52,7 @@ mpd_music_dir = /var/lib/mpd/music
 ## }
 ##
 #
-#visualizer_fifo_path = /tmp/mpd.fifo
+visualizer_fifo_path = ~/.config/mpd/mpd.fifo
 #
 ##
 ## Note: Below parameter is needed for ncmpcpp
@@ -62,12 +62,12 @@ mpd_music_dir = /var/lib/mpd/music
 ## are some problems with it.
 ##
 #
-#visualizer_output_name = Visualizer feed
+visualizer_output_name = Visualizer feed
 #
 ##
 ## If you set format to 44100:16:2, make it 'yes'.
 ##
-#visualizer_in_stereo = yes
+visualizer_in_stereo = yes
 #
 ##
 ## Multiply received samples by given value. Very