From d19d5d8d16017cd5d0826df1a211f864f194f504 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Fri, 14 Oct 2022 14:18:25 +0200
Subject: [PATCH] User session shairplay service and DBUS

---
 .../rootfs-overlay/etc/shairport-sync.conf        |  4 ++--
 .../shairport-sync.service                        |  1 +
 .../mycroft.service.wants/local-backend.service   |  1 -
 .../usr/lib/systemd/user-preset/10-ovos.preset    |  3 ++-
 .../usr/lib/systemd/user/shairport-sync.service   | 15 +++++++++++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/shairport-sync.service
 delete mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/mycroft.service.wants/local-backend.service
 create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/user/shairport-sync.service

diff --git a/buildroot-external/rootfs-overlay/etc/shairport-sync.conf b/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
index f371eb52..3d9b7b69 100644
--- a/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
+++ b/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
@@ -1,6 +1,6 @@
 general = {
   name = "OpenVoiceOS";
   output_backend = "pa";
-  dbus_service_bus = "system";
-  mpris_service_bus = "system";
+  dbus_service_bus = "session";
+  mpris_service_bus = "session";
 };
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/shairport-sync.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/shairport-sync.service
new file mode 120000
index 00000000..39bbea79
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/shairport-sync.service
@@ -0,0 +1 @@
+../../../../../../usr/lib/systemd/user/shairport-sync.service
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/mycroft.service.wants/local-backend.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/mycroft.service.wants/local-backend.service
deleted file mode 120000
index 48541d84..00000000
--- a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/mycroft.service.wants/local-backend.service
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../usr/lib/systemd/user/local-backend.service
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user-preset/10-ovos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/user-preset/10-ovos.preset
index b6884fb5..ea537a31 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user-preset/10-ovos.preset
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user-preset/10-ovos.preset
@@ -10,6 +10,7 @@ enable mycroft-gui.service
 enable mycroft-enclosure-gui.service
 enable mycroft-phal.service
 
-enable local-backend.service
+disable local-backend.service
 
 enable kdeconnectd.service
+enable shairport-sync.service
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/shairport-sync.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/shairport-sync.service
new file mode 100644
index 00000000..c15d5e72
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/shairport-sync.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Shairport-sync
+After=sound.target
+Wants=network-online.target
+After=network-online.target
+After=pulseaudio.service
+After=avahi-daemon.service
+
+[Service]
+ExecStart=/usr/bin/shairport-sync
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target