.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0e626ee1b93ef25c9c2fcd5f29ccb49eb7d6346b..5bf28db3c986125bf02f47ad239c353762763d19 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,11 @@
   <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/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.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/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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -945,14 +948,10 @@
       <workItem from="1611609259944" duration="949000" />
       <workItem from="1611653492674" duration="2030000" />
       <workItem from="1611656202680" duration="499000" />
-      <workItem from="1611669724998" duration="1948000" />
-    </task>
-    <task id="LOCAL-00393" summary=".">
-      <created>1605428228628</created>
-      <option name="number" value="00393" />
-      <option name="presentableId" value="LOCAL-00393" />
-      <option name="project" value="LOCAL" />
-      <updated>1605428228628</updated>
+      <workItem from="1611669724998" duration="1966000" />
+      <workItem from="1611688928707" duration="1220000" />
+      <workItem from="1611783609082" duration="599000" />
+      <workItem from="1611911107099" duration="499000" />
     </task>
     <task id="LOCAL-00394" summary=".">
       <created>1605431702382</created>
@@ -1290,7 +1289,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611656702791</updated>
     </task>
-    <option name="localTasksCounter" value="442" />
+    <task id="LOCAL-00442" summary=".">
+      <created>1611683302030</created>
+      <option name="number" value="00442" />
+      <option name="presentableId" value="LOCAL-00442" />
+      <option name="project" value="LOCAL" />
+      <updated>1611683302030</updated>
+    </task>
+    <option name="localTasksCounter" value="443" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index e03633e7c42f7c1e8f54ab1cd1675294a71deb64..8b6a09fbfcdf64cbbf92e5c36a9f231a06bf9b21 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -82,6 +82,12 @@ if ($_GET['device'] == 480) {
             off('bureau');
             break;
         case 'Move':
+            if(getCurrentHarmonyActivity()==='tv'){
+                _remoteCmd('pause', 'bureau');
+            }else{
+                stopPlayersIn('bureau');
+                stopHarmony();
+            }
             break;
         case 'Clock_Wise':
             volume(2, '+');
@@ -90,7 +96,7 @@ if ($_GET['device'] == 480) {
             volume(2, '-');
             break;
         case 'Tap':
-            squeezePlayByName('Samba', $squeezeboxPlayers['Bureau']);
+            squeezeResume();
             harmonyActivity('musique');
             break;
         case 'Alert':

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index 426d10236f04beb6f77fd039902fb6e190f91592..db2860f4fbd851594b8d5e991c62dc9a11557a2c 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -318,8 +318,9 @@ function mediaRaspCommons($device)
     if ($device == 'salon') {
         stopSqueezebox('Salon');
     } else if ($device == 'bureau') {
-        execScene('bureau/media/play');
-        harmonyActivity('tv');
+        if (getState('bureauPlaying', '0') === '0') {
+            execScene('bureau/media/play');
+        }
         stopSqueezebox($squeezeboxPlayers['Bureau']);
         if (!isAlive('bureau')) {
             sleep(60);

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 73a87fa6e2160ab107eb2aad39b135b5cd079920..f8fc05d647563d07587a76347719ac9b8ceab398 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -21,7 +21,7 @@ $bedlowscreenbrightness = 12;
 $home = 15;
 $alert = 16;
 
-$chambrefan = 2061;
+$chambrefan = 2724;
 
 $scenes = [
     'chambre/matin' => [
@@ -335,7 +335,7 @@ $scenes = [
         ['type' => 'function', 'function' => 'synchroSoiree'],
     ],
     'salon/on' => [
-        ['type' => 'hue', 'group' => $salon, 'scene' => 'Gte8sl76rzAD1wO','repeat'=>2],
+        ['type' => 'hue', 'group' => $salon, 'scene' => 'Gte8sl76rzAD1wO', 'repeat' => 2],
         //['type' => 'insteon', 'command' => '0?113=I=0=0'],
         ['type' => 'scene', 'scene' => 'salon/cheminee', 'delay' => 1],
     ],
@@ -352,16 +352,16 @@ $scenes = [
         // ['type' => 'insteon', 'command' => '0?1111=I=0=0'],
     ],
     'salon/cineclub' => [
-        ['type' => 'hue', 'group' => $salon, 'scene' => 'xpCjXtV3u7O1kYu','repeat'=>2],
+        ['type' => 'hue', 'group' => $salon, 'scene' => 'xpCjXtV3u7O1kYu', 'repeat' => 2],
         ['type' => 'scene', 'scene' => 'salon/cinemabase'],
     ],
     'salon/cinema' => [
-        ['type' => 'hue', 'group' => $salon, 'scene' => 'AsU9eOyGsjEyz35','repeat'=>2],
+        ['type' => 'hue', 'group' => $salon, 'scene' => 'AsU9eOyGsjEyz35', 'repeat' => 2],
         ['type' => 'scene', 'scene' => 'salon/cinemabase'],
     ],
     'salon/tamise' => [
         ['type' => 'ecomode', 'mode' => '0'],
-        ['type' => 'hue', 'group' => $salon, 'scene' => 'RbjnIcLtcDuHbfU','repeat'=>2],
+        ['type' => 'hue', 'group' => $salon, 'scene' => 'RbjnIcLtcDuHbfU', 'repeat' => 2],
         // ['type' => 'insteon', 'command' => '0?1130=I=0=0'],
         ['type' => 'function', 'function' => 'chemineeOn', 'args' => ['salon', 'fire', 0.8]],
     ],
@@ -407,6 +407,10 @@ $scenes = [
         ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'function', 'function' => 'wakeupPC', 'args' => ['avion']],
     ],
+    'bureau/cinema' => [
+        ['type' => 'scene', 'scene' => 'bureau/base/off'],
+        ['type' => 'hue', 'group' => $bureau, 'scene' => '7mofVclWdtvpVyt'],
+    ],
     'bureau/lumineux' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'SdXwtZu5PCDjK2h'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lumineux'],
@@ -509,12 +513,16 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
         ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
-    'bureau/off' => [
+    'bureau/base/off' => [
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
-        ['type' => 'hue', 'group' => $bureau, 'scene' => array('on' => false, 'brightness' => 0)],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'off'],
         ['type' => 'scene', 'scene' => 'bureau/sleeppc'],
     ],
+    'bureau/off' => [
+        ['type' => 'scene', 'scene' => 'bureau/base/off'],
+        ['type' => 'hue', 'group' => $bureau, 'scene' => array('on' => false, 'brightness' => 0)],
+
+    ],
     'bureau/sound/on' => [
         ['type' => 'domoticz', 'device' => 24, 'switchtype' => 'scene', 'command' => true, 'priority' => true],
     ],
@@ -522,15 +530,18 @@ $scenes = [
         ['type' => 'domoticz', 'device' => 24, 'switchtype' => 'scene', 'command' => false],
     ],
     'bureau/media/play' => [
+        ['type' => 'state', 'key' => 'bureauPlaying', 'value' => '1'],
         ['type' => 'scene', 'scene' => 'bureau/screen/down'],
         ['type' => 'scene', 'scene' => 'bureau/rideaux/close'],
-        ['type' => 'scene', 'scene' => 'bureau/off'],
+        ['type' => 'scene', 'scene' => 'bureau/cinema'],
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
         //['type' => 'ir', 'room' => 'bureausun', 'device' => 'Projector', 'command' => 'PowerOn'],
         ['type' => 'function', 'function' => 'harmonyActivity', 'args' => ['tv']],
         ['type' => 'scene', 'scene' => 'bureau/sound/on'],
+
     ],
     'bureau/media/stop' => [
+        ['type' => 'state', 'key' => 'bureauPlaying', 'value' => '0'],
         ['type' => 'scene', 'scene' => 'bureau/screen/up'],
         ['type' => 'scene', 'scene' => 'bureau/rideaux/open'],
         ['type' => 'scene', 'scene' => 'bureau/auto'],

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index d5136387985e699b3ac17a96b2e4c9e6fdeaae49..7c39ac3c940908b61679f28fb69aae0f22ec33f9 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -47,7 +47,9 @@ function shieldRunActivity($device = null)
             harmonyActivity('musique');
         } else {
             harmonyActivity('tv');
-            execScene('bureau/media/play');
+            if (getState('bureauPlaying', '0') === '0') {
+                execScene('bureau/media/play');
+            }
         }
     }
 }
@@ -355,7 +357,7 @@ function _adb($command, $params = '', $device = null)
 {
     $c = _adbcmd($command, $params, $device);
     $output = `$c`;
-   // echo $c . ' :: ' . $output . "\n";
+    // echo $c . ' :: ' . $output . "\n";
     return $output;
 }
 

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 5dd730a2b8deeac4b85602519828c84b2cdf5ca3..ea6cd2ba596ca56dec4a7481c71b18c664e2303d 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -50,6 +50,7 @@ function stopAllSqueezebox()
     setState('syncsoiree', '0');
 }
 
+
 function getSqueezePlayerStatus($player = '')
 {
     $res = _squeezeRequest('mode ?', $player);
@@ -78,6 +79,12 @@ function stopPlayersIn($room, $stopIfSync = true, $devices = true)
     }
 }
 
+function squeezeResume($player = '')
+{
+    $player = _squeezePlay($player, null);
+    squeezeRequest('play', $player);
+}
+
 function squeezeRequest($params, $player = '')
 {
     $redis = connectRedis();
@@ -115,7 +122,7 @@ function _squeezeRequest($params, $player = '')
 
 function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = true)
 {
-    global $squeezeboxPlayers;
+
     if (!$playIfSync && getState('syncsoiree') == '1') {
         echo 'sync enabled';
         return;
@@ -124,6 +131,19 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
     global $allmusics;
     $m = $allmusics[$musicName];
 
+    $player = _squeezePlay($player, $volume);
+    squeezeRequest('pause', $player);
+
+    foreach ($m['commands'] as $command) {
+        echo $player . ':' . $command . '<br />';
+        squeezeRequest($command, $player);
+    }
+}
+
+
+function _squeezePlay($player = '', $volume = null)
+{
+    global $squeezeboxPlayers;
     $player = _player($player);
     if (null === $player) {
         echo 'player null';
@@ -142,7 +162,7 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
     } else if ($player == $squeezeboxPlayers['Chambre']) {
         denon(true);
     }
-    squeezeRequest('pause', $player);
+
     if (null !== $volume) {
         if (config('VOLUME_DEVICE') == 'SqueezeboxPlayer') {
             $squeezeVolume = $volume;
@@ -153,10 +173,7 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
         echo 'volume ' . $squeezeVolume;
         squeezeVolume($squeezeVolume, '', $player);
     }
-    foreach ($m['commands'] as $command) {
-        echo $player . ':' . $command . '<br />';
-        squeezeRequest($command, $player);
-    }
+    return $player;
 }
 
 function _player($player = null)