.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index f3507275eaebc3018db1d3ed548b79f182456f40..ad38e4fa791e880f68e3021feb50923e4c2bf203 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.14015.106">
+  <component name="dataSourceStorageLocal" created-in="IU-233.14475.28">
     <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 1a3996c6fe866e08b8e7c2b91bf589675a30f9e4..1fe400eb22c64779fd82cb23b81f4b1d9a864993 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +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$/config/dnsmasq.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/dnsmasq.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -280,7 +281,7 @@
       <recent name="T:\Drive\Works\home\images\rooms" />
     </key>
   </component>
-  <component name="RunManager" selected="Shell Script.Update DNS">
+  <component name="RunManager" selected="Shell Script.Docker terminal">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -1297,7 +1298,8 @@
       <workItem from="1704879857290" duration="190000" />
       <workItem from="1707238767637" duration="1470000" />
       <workItem from="1707311861067" duration="5052000" />
-      <workItem from="1707323806669" duration="64000" />
+      <workItem from="1707323806669" duration="1110000" />
+      <workItem from="1708089220716" duration="1009000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1642,7 +1644,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="606" />
+    <option name="localTasksCounter" value="607" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index a33f5d35c1a8677c7bf45b1a3334de234303155c..b836749ca64560326ef68062eda20e06364b158b 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -134,18 +134,28 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
         return;
     }
 
+    $currentMusicKey = 'squeezeplaybyname_' . $player;
+    $currentMusic = getState($currentMusicKey, '');
+
+
     global $allmusics;
     $m = $allmusics[$musicName];
 
-    $player = _player($player);
-    $player = _squeezePlay($player, $volume);
     squeezeRequest('pause', $player);
 
-    foreach ($m['commands'] as $command) {
-        echo $player . ':' . $command . '<br />';
-        squeezeRequest($command, $player);
+    if ($currentMusic !== $musicName) {
+        setState($currentMusicKey, $musicName);
+        foreach ($m['commands'] as $command) {
+            echo $player . ':' . $command . '<br />';
+            squeezeRequest($command, $player);
+        }
+    } else {
+        squeezeRequest('button jump_fwd', $player);
     }
 
+    $player = _player($player);
+    $player = _squeezePlay($player, $volume);
+
     if ($player === 'Salle de bains' || $player == $squeezeboxPlayers['Salle de bains']) {
         hotwaterCheckMode();
         sleep(3);