From b1856eca4d81f28dd96d4c288ee047527511f814 Mon Sep 17 00:00:00 2001
From: cr3bs <82143395+cr3bs@users.noreply.github.com>
Date: Fri, 18 Feb 2022 10:54:14 +0100
Subject: [PATCH] snapserver: Add librespot options (110)

- Add options to set librespot devicename and zeroconf-port
- Update addon meta information to rev 110
---
 packages/addons/service/snapserver/changelog.txt          | 3 +++
 packages/addons/service/snapserver/package.mk             | 2 +-
 .../addons/service/snapserver/source/bin/snapserver.start | 5 ++++-
 .../source/resources/language/English/strings.po          | 8 ++++++++
 .../service/snapserver/source/resources/settings.xml      | 2 ++
 .../addons/service/snapserver/source/settings-default.xml | 2 ++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/snapserver/changelog.txt b/packages/addons/service/snapserver/changelog.txt
index d7280754b0..bc9c0d0d16 100644
--- a/packages/addons/service/snapserver/changelog.txt
+++ b/packages/addons/service/snapserver/changelog.txt
@@ -1,3 +1,6 @@
+110
+- Add options to set librespot devicename and zeroconf-port
+
 109
 - Add non-empty icons for snapweb
 - Fix stream argument for snapserver
diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk
index a17d5c439c..0797b23c61 100644
--- a/packages/addons/service/snapserver/package.mk
+++ b/packages/addons/service/snapserver/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="snapserver"
 PKG_VERSION="0.26.0"
-PKG_REV="109"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast"
diff --git a/packages/addons/service/snapserver/source/bin/snapserver.start b/packages/addons/service/snapserver/source/bin/snapserver.start
index f0cc4aed3d..e21dcfc6f5 100644
--- a/packages/addons/service/snapserver/source/bin/snapserver.start
+++ b/packages/addons/service/snapserver/source/bin/snapserver.start
@@ -32,7 +32,10 @@ case "$ss_st" in
     stream="pipe://$file?name=Kodi"
     ;;
   Spotify)
-    stream="spotify:///librespot?name=Spotify"
+    stream="spotify:///librespot?name=Spotify&devicename=$ss_ln"
+    if [ "$ss_lp" != 0 ]; then
+        stream="$stream&params=--zeroconf-port%3D$ss_lp"
+    fi
     ;;
   *)
     stream="airplay:///shairport-sync?name=AirPlay"
diff --git a/packages/addons/service/snapserver/source/resources/language/English/strings.po b/packages/addons/service/snapserver/source/resources/language/English/strings.po
index 1a57f0744a..a32911b08c 100644
--- a/packages/addons/service/snapserver/source/resources/language/English/strings.po
+++ b/packages/addons/service/snapserver/source/resources/language/English/strings.po
@@ -36,3 +36,11 @@ msgstr ""
 msgctxt "#30007"
 msgid "HTTP server bind address"
 msgstr ""
+
+msgctxt "#30008"
+msgid "Librespot devicename"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Librespot zeroconf-port"
+msgstr ""
diff --git a/packages/addons/service/snapserver/source/resources/settings.xml b/packages/addons/service/snapserver/source/resources/settings.xml
index 1935628ada..9fefd89acd 100644
--- a/packages/addons/service/snapserver/source/resources/settings.xml
+++ b/packages/addons/service/snapserver/source/resources/settings.xml
@@ -5,6 +5,8 @@
     <setting label="30002" type="number" id="ss_cp" default="1705"/>
     <setting label="30003" type="slider" id="ss_ni" default="0" range="-20,1,19" option="int"/>
     <setting label="30004" type="select" id="ss_st" values="AirPlay|Default|Kodi|Spotify"/>
+    <setting label="30008" type="text" id="ss_ln" subsetting="true" visible="eq(-1,Spotify)" default="Snapcast"/>
+    <setting label="30009" type="number" id="ss_lp" subsetting="true" visible="eq(-2,Spotify)" default="0"/>
     <setting type="sep"/>
     <setting label="30005" type="bool" id="ss_eh" default="false"/>
     <setting label="30006" type="number" id="ss_hp" default="1780" visible="eq(-1,true)"/>
diff --git a/packages/addons/service/snapserver/source/settings-default.xml b/packages/addons/service/snapserver/source/settings-default.xml
index 1b855074f4..06fb9d7864 100644
--- a/packages/addons/service/snapserver/source/settings-default.xml
+++ b/packages/addons/service/snapserver/source/settings-default.xml
@@ -3,6 +3,8 @@
     <setting id="ss_ni" default="true">0</setting>
     <setting id="ss_sp" default="true">1704</setting>
     <setting id="ss_st" default="true">AirPlay</setting>
+    <setting id="ss_ln" default="true">Snapcast</setting>
+    <setting id="ss_lp" default="true">0</setting>
     <setting id="ss_eh" default="true">false</setting>
     <setting id="ss_hp" default="true">1780</setting>
     <setting id="ss_ha" default="true">0.0.0.0</setting>