Merge pull request #6248 from cr3bs/feature/addons-service-snapserver-enhancements

Feature/addons service snapserver enhancements

packages/addons/service/snapserver/changelog.txt

@@ -1,3 +1,10 @@
+110
+- Add options to set librespot devicename and zeroconf-port
+
+109
+- Add non-empty icons for snapweb
+- Fix stream argument for snapserver
+
 108
 - alsa-plugins: update to 1.2.6
 - asio: update to 1.21.0

packages/addons/service/snapserver/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="snapserver"
 PKG_VERSION="0.26.0"
-PKG_REV="108"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast"

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"
@@ -54,5 +57,5 @@ snapserver \
   --http.port            "$ss_hp" \
   --http.bind_to_address "$ss_ha" \
   --http.doc_root="$ADDON_DIR/snapweb" \
-  --stream               "$stream" \
+  --stream.stream        "$stream" \
   > /dev/null

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 ""

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)"/>

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>