.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b8c33b8613c1b8f51c2ef4baef36440eccf8ac6d..8e3262b96148dda781768d9186dd155d1d76d41e 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/chambre.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/chambre.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" 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" />
@@ -935,14 +934,8 @@
       <workItem from="1610202160108" duration="2175000" />
       <workItem from="1610280280433" duration="7383000" />
       <workItem from="1610462926782" duration="1001000" />
-      <workItem from="1610483375018" duration="2127000" />
-    </task>
-    <task id="LOCAL-00384" summary=".">
-      <created>1605121533132</created>
-      <option name="number" value="00384" />
-      <option name="presentableId" value="LOCAL-00384" />
-      <option name="project" value="LOCAL" />
-      <updated>1605121533133</updated>
+      <workItem from="1610483375018" duration="3692000" />
+      <workItem from="1610701873024" duration="630000" />
     </task>
     <task id="LOCAL-00385" summary=".">
       <created>1605121882930</created>
@@ -1280,7 +1273,14 @@
       <option name="project" value="LOCAL" />
       <updated>1610463936245</updated>
     </task>
-    <option name="localTasksCounter" value="433" />
+    <task id="LOCAL-00433" summary=".">
+      <created>1610528834225</created>
+      <option name="number" value="00433" />
+      <option name="presentableId" value="LOCAL-00433" />
+      <option name="project" value="LOCAL" />
+      <updated>1610528834226</updated>
+    </task>
+    <option name="localTasksCounter" value="434" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/harmony.php b/scripts/lib/harmony.php
index 6dfe74afb7b688ebceb1b17fa80f097ca9001ee6..90f3d8f9af0cd94b86c53f5efd1b0643633ba75f 100644 (file)
--- a/scripts/lib/harmony.php
+++ b/scripts/lib/harmony.php
@@ -52,7 +52,7 @@ function harmonyActivity($activity)
     }
     if ($activity == 'tv') {
         execScene('salon/cinema');
-        runAtEnd('sleep(5);harmonyDeviceCommand(\'videoprojecteur-epson\', \'power-on\');');
+        runAtEnd('sleep(15);harmonyDeviceCommand(\'videoprojecteur-epson\', \'power-on\');');
     }
     return $res;
 }

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index 2a2ae83b0647d893661bdab949461a232f2d5fa1..828a5e47b4639d76325b4dfd8a0e2ed2856af8da 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -39,12 +39,14 @@ function shieldRunActivity($device = null)
     $onlySound = in_array(shieldGetCurrentApp($device), ['spotify']);
 
     if ($device['id'] === 'salon') {
+        stopPlayersIn('salon', true, false);
         if ($onlySound) {
             harmonyActivity('musique');
         } else {
             harmonyActivity('tv');
         }
     } else if ($device['id'] === 'bureau' || $device['id'] === 'bureausun') {
+        stopPlayersIn('bureau', true, false);
         if ($onlySound) {
             execScene('bureau/sound/on');
         } else {

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index cb332731a1dd80c742ebee7280bd9ad335f53576..79b080ffc2e03eff9bdab6103274cb3e4dccbb60 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -2,7 +2,7 @@
 
 require_once ROOT . '/config/music.php';
 
-function stopSqueezeboxPlayer($player, $stopIfSync = true)
+function stopSqueezeboxPlayer($player, $stopIfSync = true, $devices = true)
 {
     if (!$stopIfSync && getState('syncsoiree') == '1') {
         return;
@@ -12,15 +12,17 @@ function stopSqueezeboxPlayer($player, $stopIfSync = true)
     squeezeRequest('stop', $player);
     squeezeRequest('power 0', $player);
 
-    $room = getRoomBySqueezeboxPlayer($player);
-    if ($room == 'salon') {
-
-    } else if ($room === 'sdb') {
-        execScene('sdb/ampli/off');
-    } else if ($room === 'bureau') {
-        execScene('bureau/sound/off');
-    } else if ($room === 'chambre') {
-        denon(false);
+    if ($devices) {
+        $room = getRoomBySqueezeboxPlayer($player);
+        if ($room == 'salon') {
+            harmonyActivity('off');
+        } else if ($room === 'sdb') {
+            execScene('sdb/ampli/off');
+        } else if ($room === 'bureau') {
+            execScene('bureau/sound/off');
+        } else if ($room === 'chambre') {
+            denon(false);
+        }
     }
 }
 
@@ -59,17 +61,17 @@ function getSqueezePlayerStatus($player = '')
     return $res['result']['_mode'] == 'play' ? 1 : 0;
 }
 
-function stopSqueezebox($player, $stopIfSync = true)
+function stopSqueezebox($player, $stopIfSync = true, $devices = true)
 {
-    stopSqueezeboxPlayer($player, $stopIfSync);
+    stopSqueezeboxPlayer($player, $stopIfSync, $devices);
 }
 
-function stopPlayersIn($room)
+function stopPlayersIn($room, $stopIfSync = true, $devices = true)
 {
     global $squeezeboxPlayers, $squeezeboxPlayersByRoom;
     if (isset($squeezeboxPlayersByRoom[$room])) {
         foreach ($squeezeboxPlayersByRoom[$room] as $player) {
-            stopSqueezebox($player);
+            stopSqueezebox($player, $stopIfSync, $devices);
         }
     }
 }