.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1ce493009a274f340e7b8654df231dfc789303ae..3ae32af2cf37483f189a245c1af18e826089e1cf 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,13 +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/remote.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/remote.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/http.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/http.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/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.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/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/shield.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -275,17 +271,6 @@
         <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>
@@ -918,14 +903,8 @@
       <workItem from="1605355486465" duration="23396000" />
       <workItem from="1605531884401" duration="829000" />
       <workItem from="1605542056704" duration="1640000" />
-      <workItem from="1605597648537" duration="6714000" />
-    </task>
-    <task id="LOCAL-00354" summary=".">
-      <created>1603643895376</created>
-      <option name="number" value="00354" />
-      <option name="presentableId" value="LOCAL-00354" />
-      <option name="project" value="LOCAL" />
-      <updated>1603643895376</updated>
+      <workItem from="1605597648537" duration="7658000" />
+      <workItem from="1605690676577" duration="1356000" />
     </task>
     <task id="LOCAL-00355" summary=".">
       <created>1603650334848</created>
@@ -1263,7 +1242,14 @@
       <option name="project" value="LOCAL" />
       <updated>1605532129605</updated>
     </task>
-    <option name="localTasksCounter" value="403" />
+    <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>
+    </task>
+    <option name="localTasksCounter" value="404" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1310,12 +1296,12 @@
     </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="1110" y="259" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.2560.1040@0.0.2560.1040" timestamp="1605437484620" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605532120874">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605690711295">
       <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="1605086955514" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188136787" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605532120874" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605690711295" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605104496549">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 1232d51fdb7b9601304ca3f88dca149708ae7089..e7fd0b859b3017bedeec656e8074d2e49db0d56c 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -442,9 +442,9 @@ function volume($volume, $increase = '')
     switch ($d) {
         case 'shield':
             if ($increase == '-') {
-                shieldKey('volume-down');
+                return shieldKey('volume-down',$device);
             } else {
-                shieldKey('volume-up');
+                return shieldKey('volume-up',$device);
             }
         case 'raspberry':
         case 'raspberrypi':

diff --git a/scripts/lib/remoteinfos.php b/scripts/lib/remoteinfos.php
index cb64b91049324cae4fb543cf794743aa8f02ff75..85ca75effe0b5f17deeefaf225aca47e696a59fb 100644 (file)
--- a/scripts/lib/remoteinfos.php
+++ b/scripts/lib/remoteinfos.php
@@ -64,6 +64,13 @@ function remoteInfos()
 
 function remoteProgress($progress)
 {
+    if (config('TVPLAYER') === 'shield') {
+        if (shieldGetCurrentApp() === 'kodi') {
+            $p = json_decode(httpRequest('http://' . getDevice()['shield'] . ':8754/jsonrpc', 'post', '[{"jsonrpc":"2.0","method":"Player.Seek","params":[1,' . (round($progress * 100)) . '],"id":3}]', ['kodi', 'atacama'], 10, true, ['X-Requested-With' => 'XMLHttpRequest', 'Content-type' => 'application/json'])->getBody(), true);
+        }
+        return;
+    }
+
     $playing = getPlaying();
     $e = explode(':', $playing);
     $p = $e[0];