From: Vincent <vincent@enhydra.fr>
Date: Thu, 28 Nov 2019 18:50:00 +0000 (+0100)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c307ad62839b79df6ff89dc758e3c607ec7e40c3;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f3b748d..3cbdba0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,8 @@
     <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/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" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/bricks.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/bricks.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/remotecmd.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/remotecmd.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -781,14 +779,7 @@
       <workItem from="1574065436563" duration="754000" />
       <workItem from="1574066213679" duration="8067000" />
       <workItem from="1574273415760" duration="2973000" />
-      <workItem from="1574323616439" duration="14023000" />
-    </task>
-    <task id="LOCAL-00199" summary=".">
-      <created>1562828700494</created>
-      <option name="number" value="00199" />
-      <option name="presentableId" value="LOCAL-00199" />
-      <option name="project" value="LOCAL" />
-      <updated>1562828700495</updated>
+      <workItem from="1574323616439" duration="14916000" />
     </task>
     <task id="LOCAL-00200" summary=".">
       <created>1563349220382</created>
@@ -1126,7 +1117,14 @@
       <option name="project" value="LOCAL" />
       <updated>1574411352997</updated>
     </task>
-    <option name="localTasksCounter" value="248" />
+    <task id="LOCAL-00248" summary=".">
+      <created>1574966117031</created>
+      <option name="number" value="00248" />
+      <option name="presentableId" value="LOCAL-00248" />
+      <option name="project" value="LOCAL" />
+      <updated>1574966117031</updated>
+    </task>
+    <option name="localTasksCounter" value="249" />
     <servers />
   </component>
   <component name="TodoView">
diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 624d41f..363e29b 100644
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -21,7 +21,7 @@ if ($_GET['device'] == 480) {
             execScene('salon/on');
             break;
         case 'Free_Fall':
-            execScene('salon/off');
+            off('salon');
             break;
         case 'Move':
             _remoteCmd('pause', 'salon');
diff --git a/scripts/lib/bricks.php b/scripts/lib/bricks.php
index 5854d13..ddc9b80 100644
--- a/scripts/lib/bricks.php
+++ b/scripts/lib/bricks.php
@@ -30,9 +30,9 @@ function makeBricks($bricks)
 
 function getRemoteVolumeBrick($brick)
 {
-    $res = '<div class="line"><a href="#" data-remote-command="mute"><i style="font-size: 1.25em;" class="fas fa-volume-down"></i></a></div>';
+    $res = '<div class="line"><a href="#" data-remote-command="audio-track-next" data-remote-command-long="mute"><i style="font-size: 1.25em;" class="fas fa-volume-down"></i></a></div>';
     $res .= '<div class="line"><a href="#" data-remote-command="volume-up"><i class="fas fa-plus"></i></a></div>';
-    $res .= '<div class="line"><a href="#" data-remote-command="volume-down"><i class="fas fa-minus"></i></a></div>';
+    $res .= '<div class="line"><a href="#" data-remote-command="volume-down" data-remote-command-long="mute"><i class="fas fa-minus"></i></a></div>';
     return $res;
 }
 
diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index 1416a8e..01d272f 100644
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -2,13 +2,14 @@
 
 $mediaraspclient = null;
 
-function _remoteCmd($cmd,$device){
+function _remoteCmd($cmd, $device)
+{
     // We first try to send it to salon raspberry before sending a less robust ir command
     if (!remoteCmd($cmd, $device)) {
         if ($device == 'salon') {
-            echo 'run '.$cmd.' with harmony';
+            echo 'run ' . $cmd . ' with harmony';
             harmonyRequest('commands/' . $cmd, 'POST');
-        }else{
+        } else {
             echo 'ok';
         }
     }
@@ -165,7 +166,7 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
         'subtitles-increase-delay-long' => 'subtitles-increase-delay-long',
         'subtitles-decrease-delay' => 'subtitles-decrease-delay',
         'subtitles-decrease-delay-long' => 'subtitles-decrease-delay-long',
-
+        'audio-track-next' => 'audio-track-next',
     ];
 
 
@@ -197,6 +198,8 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
             sendHotKey('h', 40);
         } else if ($key == 'subtitles-decrease-delay-long') {
             sendHotKey('g', 40);
+        } else if ($key == 'audio-track-next') {
+            sendHotKey('b');
         } else if ($key == 'rewind' || $key == 'fast-rewind' || $key == 'forward' || $key == 'fast-forward') {
             if ($key == 'rewind' || $key == 'forward') {
                 $amount = 15;
@@ -329,9 +332,9 @@ function mediaRaspCommons($device)
     } else if ($device == 'bureau') {
         execScene('bureau/media/play');
         stopSqueezebox($squeezeboxPlayers['Bureau']);
-        if(!isAlive('bureau')){
+        if (!isAlive('bureau')) {
             sleep(60);
-            irsend('bureau','Projector','PowerOn');
+            irsend('bureau', 'Projector', 'PowerOn');
         }
 //        sshRunCommand('/usr/local/bin/soundtohdmi', 'bureau');
     } else if ($device == 'sdb') {