From 527b2977e5b77b73fd74c536c26a28f5e241611a Mon Sep 17 00:00:00 2001
From: Vincent <vincent@enhydra.fr>
Date: Tue, 26 Jan 2021 18:48:21 +0100
Subject: [PATCH] .

---
 .idea/workspace.xml               | 21 +++++++++++----------
 scripts/cron/cron.php             | 18 +++++++++---------
 scripts/domoticz_device_event.php |  9 ++-------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f13f7f7..0e626ee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +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$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -944,14 +944,8 @@
       <workItem from="1611585304162" duration="1674000" />
       <workItem from="1611609259944" duration="949000" />
       <workItem from="1611653492674" duration="2030000" />
-      <workItem from="1611656202680" duration="487000" />
-    </task>
-    <task id="LOCAL-00392" summary=".">
-      <created>1605365556377</created>
-      <option name="number" value="00392" />
-      <option name="presentableId" value="LOCAL-00392" />
-      <option name="project" value="LOCAL" />
-      <updated>1605365556377</updated>
+      <workItem from="1611656202680" duration="499000" />
+      <workItem from="1611669724998" duration="1948000" />
     </task>
     <task id="LOCAL-00393" summary=".">
       <created>1605428228628</created>
@@ -1289,7 +1283,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611655420798</updated>
     </task>
-    <option name="localTasksCounter" value="441" />
+    <task id="LOCAL-00441" summary=".">
+      <created>1611656702791</created>
+      <option name="number" value="00441" />
+      <option name="presentableId" value="LOCAL-00441" />
+      <option name="project" value="LOCAL" />
+      <updated>1611656702791</updated>
+    </task>
+    <option name="localTasksCounter" value="442" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 0cafc05..38b7061 100644
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -191,15 +191,15 @@ function cronSqueezeFavorites($cronmin)
 function cronSqueezeCheckPlayers($cronmin)
 {
     _logSection('Check squeezebox players');
-    $players = ['Salon' => 'salon', 'Bureau' => 'bureau'];
-    foreach ($players as $player => $device) {
-        if (getSqueezePlayerStatus($player) === -1) {
-            if (!shieldPlayingVideo($device)) {
-                shieldRunAppAndBackHome('sbplayer', $device, 1, true);
-                sleep(5);
-            }
-        }
-    }
+//    $players = ['Salon' => 'salon', 'Bureau' => 'bureau'];
+//    foreach ($players as $player => $device) {
+//        if (getSqueezePlayerStatus($player) === -1) {
+//            if (!shieldPlayingVideo($device)) {
+//                shieldRunAppAndBackHome('sbplayer', $device, 1, true);
+//                sleep(5);
+//            }
+//        }
+//    }
 }
 
 function cronWeather($cronmin)
diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 5e4e234..e03633e 100644
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -82,7 +82,6 @@ if ($_GET['device'] == 480) {
             off('bureau');
             break;
         case 'Move':
-            off('bureau');
             break;
         case 'Clock_Wise':
             volume(2, '+');
@@ -91,12 +90,8 @@ if ($_GET['device'] == 480) {
             volume(2, '-');
             break;
         case 'Tap':
-            if (getCurrentHarmonyActivity() == 'poweroff') {
-                squeezePlayByName('Samba', $squeezeboxPlayers['Bureau']);
-            } else if (getCurrentHarmonyActivity() == 'musique') {
-                stopHarmony();
-                stopPlayersIn('bureau');
-            }
+            squeezePlayByName('Samba', $squeezeboxPlayers['Bureau']);
+            harmonyActivity('musique');
             break;
         case 'Alert':
         default:
-- 
2.39.5