.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7a049f9dab2f171b4910d9ce97950a6fa47fa24b..fa5b9401ef405f71219f57911a880432f2aff79e 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,12 +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/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.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/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/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/raspberrycast.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/raspberrycast.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="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -220,7 +217,7 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553247665857" />
     <property name="dumpAutoload T:/Drive/Works/home/composer.json" value="--no-interaction --ansi --verbose --optimize" />
     <property name="editor.config.ad.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/scripts/lib" />
     <property name="list.type.of.created.stylesheet" value="Less" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Problems" />
@@ -229,19 +226,19 @@
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\CloudStation\Works\home\style\fonts" />
-      <recent name="T:\CloudStation\Drive\Works\home\tools\jarvis" />
-      <recent name="T:\CloudStation\Drive\Works\home" />
-      <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts" />
-      <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts\550" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\scripts\lib" />
       <recent name="D:\CloudStation\Works\home\images\backgrounds" />
       <recent name="T:\CloudStation\Drive\Works\home\images\backgrounds" />
       <recent name="T:\CloudStation\Drive\Works\home\scripts" />
       <recent name="T:\CloudStation\Drive\Works\home\style\fonts" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\CloudStation\Works\home\style\fonts" />
+      <recent name="T:\CloudStation\Drive\Works\home\tools\jarvis" />
+      <recent name="T:\CloudStation\Drive\Works\home" />
       <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts" />
+      <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts\550" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -717,14 +714,7 @@
       <workItem from="1566602835458" duration="785000" />
       <workItem from="1566643527124" duration="3756000" />
       <workItem from="1566649679962" duration="18000" />
-      <workItem from="1566649714025" duration="6753000" />
-    </task>
-    <task id="LOCAL-00165" summary=".">
-      <created>1551166201535</created>
-      <option name="number" value="00165" />
-      <option name="presentableId" value="LOCAL-00165" />
-      <option name="project" value="LOCAL" />
-      <updated>1551166201535</updated>
+      <workItem from="1566649714025" duration="9725000" />
     </task>
     <task id="LOCAL-00166" summary=".">
       <created>1551168960202</created>
@@ -1062,7 +1052,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566603610179</updated>
     </task>
-    <option name="localTasksCounter" value="214" />
+    <task id="LOCAL-00214" summary=".">
+      <created>1566737418166</created>
+      <option name="number" value="00214" />
+      <option name="presentableId" value="LOCAL-00214" />
+      <option name="project" value="LOCAL" />
+      <updated>1566737418166</updated>
+    </task>
+    <option name="localTasksCounter" value="215" />
     <servers />
   </component>
   <component name="TodoView">

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 2b7c8716855131f0a230995af3de4702f51456fd..3400b8ea4f3df1d4b9a6b427a52056e772e9e45a 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -433,8 +433,8 @@ function volume($volume, $increase = '')
             }
         case 'RaspberryCast':
             return raspberryCast('sound?vol=' . ($increase == '-' ? 'less' : 'more'));
-        case 'OMX':
-            return VLCCmd(['action' => 'shortcut', 'shortcut' => $increase], $device);
+        case 'VLC':
+            return VLCCmd(['command' => 'volume', 'val' => $increase . '20'], $device);
     }
 }
 

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index faf933cabb0fe14a14241e807f7ef852ab4936ac..7e577cd073e24ccb2960490e198c1d8a40a41a3c 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -318,7 +318,7 @@ function mediaRaspCommons($device)
     } else if ($device == 'bureau') {
         execScene('bureau/media/play');
         stopSqueezebox($squeezeboxPlayers['Bureau']);
-        sshCommand('/usr/local/bin/soundtohdmi', $device);
+        sshCommand('/usr/local/bin/soundtohdmi', 'bureau');
     } else if ($device == 'sdb') {
         execScene('sdb/ampli/on');
     }
@@ -347,6 +347,7 @@ function mediaRaspPlayStream($url, $device = null)
 
     }
     setPlaying('mediarasp:' . $url, $device);
+    mediaRaspCommons($device);
     return $res;
 }
 

diff --git a/scripts/lib/off.php b/scripts/lib/off.php
index 2b91157226ee9083dfcfa6fc9c8086a78f74ff4d..c98e54e1dd088c7c23c1672b60f46ce4fb6f1a75 100644 (file)
--- a/scripts/lib/off.php
+++ b/scripts/lib/off.php
@@ -31,7 +31,7 @@ function offBureau()
 {
     domoticzSwitch(1, false);
     irsend('bureau', 'Projector', 'PowerOn');
-    sleep(1);
+    sleep(2);
     irsend('bureau', 'Projector', 'PowerOn');
 }