.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d00101ea4dc69bd10d8e4ed5c0526ce4d0132575..5dad6c02d3ae23b5902f9cf685a97b25a9aa76dd 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,9 @@
   <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$/config/sdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/sdb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/gradient.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/cachemedia.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/cachemedia.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" />
@@ -855,14 +858,12 @@
       <workItem from="1595786545513" duration="1752000" />
       <workItem from="1596007424722" duration="1301000" />
       <workItem from="1596008819798" duration="513000" />
-      <workItem from="1596059067355" duration="1098000" />
-    </task>
-    <task id="LOCAL-00290" summary=".">
-      <created>1580894984838</created>
-      <option name="number" value="00290" />
-      <option name="presentableId" value="LOCAL-00290" />
-      <option name="project" value="LOCAL" />
-      <updated>1580894984838</updated>
+      <workItem from="1596059067355" duration="3956000" />
+      <workItem from="1596180609249" duration="23000" />
+      <workItem from="1597598891734" duration="24000" />
+      <workItem from="1597733676813" duration="70000" />
+      <workItem from="1598117505408" duration="292000" />
+      <workItem from="1598259122444" duration="621000" />
     </task>
     <task id="LOCAL-00291" summary=".">
       <created>1580934552925</created>
@@ -1200,7 +1201,14 @@
       <option name="project" value="LOCAL" />
       <updated>1596008713256</updated>
     </task>
-    <option name="localTasksCounter" value="339" />
+    <task id="LOCAL-00339" summary=".">
+      <created>1596139717624</created>
+      <option name="number" value="00339" />
+      <option name="presentableId" value="LOCAL-00339" />
+      <option name="project" value="LOCAL" />
+      <updated>1596139717624</updated>
+    </task>
+    <option name="localTasksCounter" value="340" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1250,11 +1258,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="760" y="94" key="#Project_Structure/0.0.2560.1040@0.0.2560.1040" timestamp="1592377765650" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1596008700152">
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1596139707722">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1595521315206" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1596008700152" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1596139707722" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/sdb.php b/config/sdb.php
index 2b7416ef0f6ee0d67d53e65cc99cf9e0027a7d9d..8292a682b2a7de9c6dce3cb56b77fa811a7eefa8 100644 (file)
--- a/config/sdb.php
+++ b/config/sdb.php
@@ -31,7 +31,7 @@ if (DISPLAYINTERFACE) {
                ['type' => 'volume', 'volume' => '5%', 'increase' => '+', 'label' => '<i class="fa fa-volume-up"></i>'],
                ['type' => 'volume', 'volume' => '5%', 'increase' => '-', 'label' => '<i class="fa fa-volume-down"></i>'],
        ];
-       $favoriteslights[] = array_merge($allmusics['France Info'], array('volume' => 30));
+       $favoriteslights[] = array_merge($allmusics['France Info'], array('volume' => 50));
     $favoriteslights = array_merge($favoriteslights, $c['favorites']);
        include "media.php";
        include "default.php";

diff --git a/gradient.php b/gradient.php
index db280cc55a5bb758f4e66920429fb8abe9abe230..b73e3ef21e1fe7d5977e58356d24c26ca03e403c 100644 (file)
--- a/gradient.php
+++ b/gradient.php
@@ -41,7 +41,7 @@
                             css.backgroundImage = 'none';
                             //videoURL = data.data.video_path;
                             videoURL = data.data.video_path.replace('/nas/', 'file:///Z:/');
-                            videoURL = videoURL.replace('file:///Z:/Videos/YoutubeDL', 'file:///C:/YoutubeDL');
+                            videoURL = videoURL.replace('file:///Z:/Videos/YoutubeDL', 'file:///D:/YoutubeDL');
                             startVideo = 1;
                             if (data.data.start) {
                                 startVideo = data.data.start;

diff --git a/scripts/lib/cachemedia.php b/scripts/lib/cachemedia.php
index 3dd53b8c6752e5e272632814bec00438dbdbc51c..a9aa90fd7d8e6c1d726a548f2df63c749fbcfd84 100644 (file)
--- a/scripts/lib/cachemedia.php
+++ b/scripts/lib/cachemedia.php
@@ -12,7 +12,7 @@ function cacheMedia($url)
 
     $limit = time() - 604800;
     if (!file_exists($cachedFile) || filemtime($cachedFile) < $limit) {
-        copy($url, $cachedFile);
+        @copy($url, $cachedFile);
     }
     return $cachedURL;
 }
\ No newline at end of file

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 8d9914384f981e006af4556209134ca21f72d28f..feaaad9b828294e7ab83bc6df376f587b0b45b0c 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -562,8 +562,8 @@ $scenes = [
     ],
     'sdb/on' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
-        // ['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'none']],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => '0L4cGh7y29uBBez'],
+        ['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'none']],
+        ['type' => 'hue', 'group' => $sdb, 'scene' => 'LmwN0cs0qsep2sA'],
     ],
     'sdb/morning' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
@@ -572,8 +572,8 @@ $scenes = [
     ],
     'sdb/nuit' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
-        //['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'none']],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => 'ZTZBNRk6VZMlYvB'],
+        ['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'none']],
+        ['type' => 'hue', 'group' => $sdb, 'scene' => 'S59ayiWOy11L2tR'],
     ],
     'sdb/spa' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],