.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index ad38e4fa791e880f68e3021feb50923e4c2bf203..59fa46be04b720e8ea0c90ee3bf74dd8540226b0 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-233.14475.28">
+  <component name="dataSourceStorageLocal" created-in="IU-233.14808.21">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a79c8e00990b02692087b003fef1fe71efeab279..e67cf67419f9fdf857e7dc2ca984aa69b5fb2b43 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/healthcheck" beforeDir="false" afterPath="$PROJECT_DIR$/bin/healthcheck" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/velib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/velib.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1304,7 +1303,8 @@
       <workItem from="1708442844514" duration="418000" />
       <workItem from="1709114228146" duration="2292000" />
       <workItem from="1709117286043" duration="1376000" />
-      <workItem from="1710247312163" duration="986000" />
+      <workItem from="1710247312163" duration="2244000" />
+      <workItem from="1710336216495" duration="1424000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1649,7 +1649,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="609" />
+    <option name="localTasksCounter" value="610" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 45af8f01f71afd5946cd5542e09a62fbee246a7a..21c782efd3fa7a3af0993353d81db3bfbe34fe40 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -54,18 +54,29 @@ function stopAllSqueezebox()
 }
 
 
-function getSqueezePlayerStatus($player = '')
+function getSqueezePlayerStatusName($player = '')
 {
     $res = _squeezeRequest('mode ?', $player);
     if (null === $res) {
-        return -1;
+        return null;
     }
 
-    print_r($res);
     if (!isset($res['result']) || !isset($res['result']['_mode'])) {
+        return 'unset';
+    }
+    return $res['result']['_mode'];
+}
+
+function getSqueezePlayerStatus($player = '')
+{
+    $s = getSqueezePlayerStatusName($player);
+    if (null === $s) {
+        return -1;
+    }
+    if ($s === 'unset') {
         return -2;
     }
-    return $res['result']['_mode'] == 'play' ? 1 : 0;
+    return $s == 'play' ? 1 : 0;
 }
 
 function stopSqueezebox($player, $stopIfSync = true, $devices = true)
@@ -136,16 +147,21 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
 
     $player = _player($player);
 
-    $sdb=$player === 'Salle de bains' || $player == $squeezeboxPlayers['Salle de bains'];
-    $wc=$player === 'WC' || $player == $squeezeboxPlayers['WC'];
+    $sdb = $player === 'Salle de bains' || $player == $squeezeboxPlayers['Salle de bains'];
+    $wc = $player === 'WC' || $player == $squeezeboxPlayers['WC'];
 
     $currentMusicKey = 'squeezeplaybyname_' . $player;
-    $currentMusic = getState($currentMusicKey, '');
+    $s = getSqueezePlayerStatusName($player);
+    if (null === $s || $s === 'stop' || $s === 'unset') {
+        $currentMusic = '';
+    } else {
+        $currentMusic = getState($currentMusicKey, '');
+    }
 
     global $allmusics;
     $m = $allmusics[$musicName];
 
-    if($wc) {
+    if ($wc) {
         squeezeRequest('pause', $player);
         if ($currentMusic !== $musicName) {
             setState($currentMusicKey, $musicName);
@@ -156,7 +172,7 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
         } else {
             squeezeRequest('button jump_fwd', $player);
         }
-    }else{
+    } else {
         squeezeRequest('pause', $player);
         foreach ($m['commands'] as $command) {
             echo $player . ':' . $command . '<br />';
@@ -164,7 +180,7 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
         }
     }
 
-    $player = _squeezePlay($player, $volume);
+    _squeezePlay($player, $volume);
 
     if ($sdb) {
         hotwaterCheckMode();