librespot: minor fixes

packages/addons/service/librespot/changelog.txt

@@ -1,3 +1,7 @@
+114
+- Fix discovery mode setting
+- Start after Kodi
+
 113
 - Update to 96557b4
 

packages/addons/service/librespot/package.mk

@@ -5,7 +5,8 @@
 PKG_NAME="librespot"
 PKG_VERSION="96557b4ec1c45413cdf34673695f1269f99e3545"
 PKG_SHA256="09fe8f8de50d25e460bdc75d02239961336ac4db837509386ac17057b00cc49a"
-PKG_REV="113"
+PKG_VERSION_DATE="2018-11-07"
+PKG_REV="114"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/librespot-org/librespot/"
@@ -13,7 +14,7 @@ PKG_URL="https://github.com/librespot-org/librespot/archive/$PKG_VERSION.zip"
 PKG_DEPENDS_TARGET="toolchain avahi pulseaudio pyalsaaudio rust"
 PKG_SECTION="service"
 PKG_SHORTDESC="Librespot: play Spotify through LibreELEC using a Spotify app as a remote"
-PKG_LONGDESC="Librespot ($PKG_VERSION) plays Spotify through LibreELEC using the open source librespot library using a Spotify app as a remote."
+PKG_LONGDESC="Librespot ($PKG_VERSION_DATE) plays Spotify through LibreELEC using the open source librespot library using a Spotify app as a remote."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"

packages/addons/service/librespot/source/bin/librespot.start

@@ -63,7 +63,7 @@ init_alsa() {
 
   case "$LIBREELEC_ARCH" in
     RPi*.arm)
-      [ "$(readlink /proc/asound/ALSA)" == "card$index" ] && [ "$pcm_3" ] &&
+      [ "$(readlink /proc/asound/ALSA)" = "card$index" ] && [ "$pcm_3" ] &&
         amixer -c "$index" cset name="PCM Playback Route" "$pcm_3"
       ;;
   esac
@@ -82,13 +82,13 @@ if [ -n "$ls_b" -a "$ls_b" != "-" ]; then
   LIBRESPOT="$LIBRESPOT --bitrate $ls_b"
 fi
 
-if [ -n "$ls_p" -a -n "$ls_u" ]; then
+if [ "$ls_a" = "true" -a -n "$ls_p" -a -n "$ls_u" ]; then
   LIBRESPOT="$LIBRESPOT --disable-discovery \
                         --password \"$ls_p\" \
                         --username \"$ls_u\""
 fi
 
-if [ "$ls_m" == "Kodi" ]; then
+if [ "$ls_m" = "Kodi" ]; then
   LIBRESPOT="$LIBRESPOT --backend pulseaudio --device-type TV"
 else
   init_alsa

packages/addons/service/librespot/source/resources/language/English/strings.po

@@ -48,7 +48,7 @@ msgid "Password"
 msgstr ""
 
 msgctxt "#30112"
-msgid "Discovery mode"
+msgid "User mode"
 msgstr ""
 
 msgctxt "#30113"

packages/addons/service/librespot/source/resources/settings.xml

@@ -7,5 +7,5 @@
     <setting id="ls_b"  label="30102" type="labelenum" lvalues="30103|30104|30105|30106" />
     <setting id="ls_a"  label="30112" type="bool"      default="false" />
     <setting id="ls_u"  label="30110" type="text"      subsetting="true" visible="eq(-1,true)" default="" />
-    <setting id="ls_p"  label="30111" type="text"      subsetting="true" visible="eq(-2,true)" default="" />
+    <setting id="ls_p"  label="30111" type="text"      subsetting="true" visible="eq(-2,true)" default="" option="hidden" />
 </settings>

packages/addons/service/librespot/source/system.d/service.librespot.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=librespot
-After=kodi.service network-online.target sound.target
-Requires=kodi.service network-online.target sound.target
+Wants=kodi.service
+After=kodi.service
 
 [Service]
 EnvironmentFile=/storage/.kodi/addons/service.librespot/bin/librespot.env
@@ -10,4 +10,4 @@ ExecStopPost=/usr/bin/pactl suspend-sink "$LS_SINK" 1
 Restart=on-failure
 
 [Install]
-WantedBy=kodi.target
+WantedBy=kodi.service