]> _ Git - tortuga-home.git/commitdiff
.
authorVincent <vincent@enhydra.fr>
Sat, 20 Feb 2021 10:22:33 +0000 (11:22 +0100)
committerVincent <vincent@enhydra.fr>
Sat, 20 Feb 2021 10:22:33 +0000 (11:22 +0100)
.idea/workspace.xml
scripts/lib/off.php

index e9ab19b702d39d24f4afacdd7084fd89f38ce335..aa442fa0eb6b48c33e0b8ddc06c6a16ca5d19e6c 100644 (file)
@@ -3,8 +3,7 @@
   <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/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.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/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
       <workItem from="1612793924157" duration="7405000" />
       <workItem from="1612981789538" duration="2761000" />
       <workItem from="1613594262179" duration="860000" />
-      <workItem from="1613737644524" duration="414000" />
-    </task>
-    <task id="LOCAL-00403" summary=".">
-      <created>1605613782452</created>
-      <option name="number" value="00403" />
-      <option name="presentableId" value="LOCAL-00403" />
-      <option name="project" value="LOCAL" />
-      <updated>1605613782452</updated>
+      <workItem from="1613737644524" duration="2679000" />
+      <workItem from="1613767930279" duration="766000" />
     </task>
     <task id="LOCAL-00404" summary=".">
       <created>1605694444185</created>
       <option name="project" value="LOCAL" />
       <updated>1613067752007</updated>
     </task>
-    <option name="localTasksCounter" value="452" />
+    <task id="LOCAL-00452" summary=".">
+      <created>1613738341286</created>
+      <option name="number" value="00452" />
+      <option name="presentableId" value="LOCAL-00452" />
+      <option name="project" value="LOCAL" />
+      <updated>1613738341287</updated>
+    </task>
+    <option name="localTasksCounter" value="453" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
index 2c1426459ef008e1c39eb804813c284620d8e65b..4791505503be25053ac0d228b3f5d8d7500fa68e 100644 (file)
@@ -19,13 +19,16 @@ function off($device = null)
 
 function commonOff($device)
 {
-    remoteCmdMedia('stop', $device);
+    $novlc = ['bureau', 'salon'];
+    if (!in_array($device, $novlc)) {
+        remoteCmdMedia('stop', $device);
+    }
     stopPlayersIn($device);
 }
 
 function offSalon()
 {
-    epson(false,true);
+    epson(false, true);
     denonAVROff();
     shieldKillAll('salon');
     shieldSleep('salon');