.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 543f5b627ff54e467e50e538cfa71f6f2480f6d3..e9ab19b702d39d24f4afacdd7084fd89f38ce335 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +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/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.php" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -961,14 +962,9 @@
       <workItem from="1612620424202" duration="11603000" />
       <workItem from="1612640974349" duration="5182000" />
       <workItem from="1612793924157" duration="7405000" />
-      <workItem from="1612981789538" duration="2738000" />
-    </task>
-    <task id="LOCAL-00402" summary=".">
-      <created>1605532129605</created>
-      <option name="number" value="00402" />
-      <option name="presentableId" value="LOCAL-00402" />
-      <option name="project" value="LOCAL" />
-      <updated>1605532129605</updated>
+      <workItem from="1612981789538" duration="2761000" />
+      <workItem from="1613594262179" duration="860000" />
+      <workItem from="1613737644524" duration="414000" />
     </task>
     <task id="LOCAL-00403" summary=".">
       <created>1605613782452</created>
@@ -1306,7 +1302,14 @@
       <option name="project" value="LOCAL" />
       <updated>1612986006478</updated>
     </task>
-    <option name="localTasksCounter" value="451" />
+    <task id="LOCAL-00451" summary=".">
+      <created>1613067752007</created>
+      <option name="number" value="00451" />
+      <option name="presentableId" value="LOCAL-00451" />
+      <option name="project" value="LOCAL" />
+      <updated>1613067752007</updated>
+    </task>
+    <option name="localTasksCounter" value="452" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/denon.php b/scripts/lib/denon.php
index b1fd2eb7cdc249c9ea0ee0cf214afe24d2ff0c37..0df0cb23460d2a445a9d5858991c40011de0e0b0 100644 (file)
--- a/scripts/lib/denon.php
+++ b/scripts/lib/denon.php
@@ -50,7 +50,7 @@ function denonAVRInput($input)
         sleep(1);
     }
 
-    $audioMode = ['Media Player' => 'MOVIE', 'AUX' => 'MUSIC', 'CD' => 'MUSIC'];
+    $audioMode = ['Media Player' => 'DOLBY DIGITAL', 'AUX' => 'DOLBY DIGITAL', 'CD' => 'DOLBY DIGITAL'];
     if (isset($audioMode[$input])) {
         denonAVRSetAudioMode($audioMode[$input]);
         usleep(1000000 * 0.5);

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index e6eb859406aea0c5c5f343a43a15ced763e4c22e..a7965de1149fab362f85542636fa51773dac337d 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -326,6 +326,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'salon/off'],
         ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
+        ['type' => 'scene', 'scene' => 'salon/media/off'],
         ['type' => 'function', 'function' => 'stopHarmony'],
         ['type' => 'function', 'function' => 'stopAllSqueezebox'],
         ['type' => 'nightmode', 'mode' => '1'],
@@ -382,6 +383,9 @@ $scenes = [
     'salon/cheminee/off' => [
         ['type' => 'function', 'function' => 'chemineeOff', 'args' => ['salon']],
     ],
+    'salon/media/off' => [
+        ['type' => 'function', 'function' => 'off','args'=>['salon']],
+    ],
     'salon/media/play' => [
 
     ],
@@ -577,6 +581,7 @@ $scenes = [
         ['type' => 'ecomode', 'mode' => '2'],
         ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
+        ['type' => 'scene', 'scene' => 'salon/media/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'chambre/off'],