.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ca6843156298462c0c99acf152481ad49aae944f..08372342ac654cb524048e987259a99d00eca0ae 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/state.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -899,14 +901,9 @@
       <workItem from="1604152329376" duration="42646000" />
       <workItem from="1604347943058" duration="16133000" />
       <workItem from="1604497757709" duration="6812000" />
-      <workItem from="1604521477525" duration="780000" />
-    </task>
-    <task id="LOCAL-00324" summary=".">
-      <created>1591461737974</created>
-      <option name="number" value="00324" />
-      <option name="presentableId" value="LOCAL-00324" />
-      <option name="project" value="LOCAL" />
-      <updated>1591461737974</updated>
+      <workItem from="1604521477525" duration="943000" />
+      <workItem from="1604526310660" duration="647000" />
+      <workItem from="1604565468930" duration="1446000" />
     </task>
     <task id="LOCAL-00325" summary=".">
       <created>1591868948121</created>
@@ -1244,7 +1241,14 @@
       <option name="project" value="LOCAL" />
       <updated>1604521524933</updated>
     </task>
-    <option name="localTasksCounter" value="373" />
+    <task id="LOCAL-00373" summary=".">
+      <created>1604522275963</created>
+      <option name="number" value="00373" />
+      <option name="presentableId" value="LOCAL-00373" />
+      <option name="project" value="LOCAL" />
+      <updated>1604522275963</updated>
+    </task>
+    <option name="localTasksCounter" value="374" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1294,12 +1298,12 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604521502998">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604522273495">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1604307637401" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1602171117745" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1604521502998" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1604522273495" />
     <state x="635" y="216" key="FileChooserDialogImpl" timestamp="1604227698339">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
@@ -1321,11 +1325,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="295" y="0" width="1290" height="907" key="dock-window-1/0.0.2560.1040@0.0.2560.1040" timestamp="1603274697406" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1604521587887">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1604565837014">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="651" y="227" width="550" height="534" key="find.popup/0.0.1707.920@0.0.1707.920" timestamp="1604301949692" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1604521587887" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1604565837014" />
     <state x="1056" y="292" key="refactoring.ChangeSignatureDialog" timestamp="1604518096294">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/salon.php b/config/salon.php
index 35af00e32ff0dca68bdfb320180df944dc1e98d7..8c100ca3029edf1d18427406d9be3139d873c1c0 100644 (file)
--- a/config/salon.php
+++ b/config/salon.php
@@ -4,7 +4,7 @@ config('ROOM', 'salon');
 config('SQUEEZEBOX_PLAYER', 'Salon');
 config('VIDEOPLAYER', 'shield');
 config('TVPLAYER', 'shield');
-config('VOLUME_DEVICE', 'shield');
+config('VOLUME_DEVICE', 'harmony');
 config('VIDEOPLAYER_DEVICE', 'salon');
 config('HIDEMASK_TIMEOUT', 250);
 

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index a7209f7d14017a05e95b2dbd191fb8f66d502017..2e214d6dbcc5c7973734c611c0bd12df2ca3dae5 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -38,10 +38,10 @@ if ($_GET['device'] == 480) {
             }
             break;
         case 'Clock_Wise':
-            volume(1,'+');
+            volume(3,'+');
             break;
         case 'Anti_Clock_Wise':
-            volume(1,'-');
+            volume(3,'-');
             break;
         case 'Tap':
             if (getCurrentHarmonyActivity() == 'poweroff') {

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 1f3477def60ebd7c396e9473a0ec9b036df9c73e..0ac29ed8ecf42035bfd8977d1becad082c6dcb9d 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -444,10 +444,16 @@ function volume($volume, $increase = '')
         case 'squeezebox':
             return squeezeVolume($volume, $increase, config('SQUEEZEBOX_PLAYER'));
         case 'harmony':
+            $lastHarmonyVolume = getState('last_harmony_volume', 0);
+            $limit = time() - 2;
+            if ($lastHarmonyVolume > $limit) {
+                return;
+            }
+            setState('last_harmony_volume', time());
             if ($increase == '-') {
-                return harmonyRequest('commands/volume-down', 'POST');
+                return harmonyRequest('commands/volume-down?repeat=5', 'POST');
             } else {
-                return harmonyRequest('commands/volume-up', 'POST');
+                return harmonyRequest('commands/volume-up?repeat=4', 'POST');
             }
         case 'vlc':
             return VLCCmd(['command' => 'volume', 'val' => $increase . '20'], $device);