.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 701b32ea4b5390ec22a097cde3c4c0663fd7dac2..a39bca149a36d345bcf65213024655561ded5563 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +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$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/ssh.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/bricks.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/bricks.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -40,24 +40,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/tmdb.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/Command.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -85,47 +67,69 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/servers/ssh.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="595">
-              <caret line="35" column="72" selection-start-line="35" selection-start-column="72" selection-end-line="35" selection-end-column="72" />
+            <state relative-caret-position="187">
+              <caret line="12" column="50" lean-forward="true" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="50" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+        <entry file="file://$PROJECT_DIR$/scripts/seen.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="325">
-              <caret line="303" column="45" lean-forward="true" selection-start-line="303" selection-start-column="45" selection-end-line="303" selection-end-column="45" />
+            <state relative-caret-position="34">
+              <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
+        <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
+            <state relative-caret-position="71">
+              <caret line="68" selection-start-line="68" selection-end-line="68" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/freeboxchannel.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="4" column="30" lean-forward="true" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
+            <state relative-caret-position="476">
+              <caret line="187" column="30" selection-start-line="187" selection-start-column="30" selection-end-line="187" selection-end-column="30" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/transcode.php">
+        <entry file="file://$PROJECT_DIR$/config/remote.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="26" />
+            <state relative-caret-position="-680" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/bricks.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="408">
+              <caret line="42" column="114" selection-start-line="42" selection-start-column="114" selection-end-line="42" selection-end-column="114" />
+              <folding>
+                <element signature="n#style#0;n#i#0;n#a#0;n#div#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#i#0;n#div#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="true" current-in-tab="false">
+        <entry file="remoteDeploymentFS://&lt;8cda9e1e-98d8-49bb-81b8-f2badfeb706b&gt;/cache/seen.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret column="10173" selection-start-column="10167" selection-end-column="10173" />
             </state>
           </provider>
         </entry>
@@ -145,10 +149,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>.music</find>
-      <find>cronSeen</find>
-      <find>8084</find>
-      <find>tvhe</find>
       <find>9981</find>
       <find>192.168.1.69</find>
       <find>startserver</find>
@@ -175,6 +175,10 @@
       <find>tvShowLibra</find>
       <find>connectRedis()-&gt;</find>
       <find>tmdb.</find>
+      <find>Galactica</find>
+      <find>galactica</find>
+      <find>S01E02</find>
+      <find>cronsee</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -205,7 +209,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/config/chambre.php" />
         <option value="$PROJECT_DIR$/config/cuisine.php" />
         <option value="$PROJECT_DIR$/config/entree.php" />
         <option value="$PROJECT_DIR$/config/lit.php" />
@@ -233,7 +236,6 @@
         <option value="$PROJECT_DIR$/scripts/sections.php" />
         <option value="$PROJECT_DIR$/scripts/seen.php" />
         <option value="$PROJECT_DIR$/scripts/lib/medialibrary.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/mediarasp.php" />
         <option value="$PROJECT_DIR$/config/tv.php" />
         <option value="$PROJECT_DIR$/servers/startdaemon" />
         <option value="$PROJECT_DIR$/servers/stopdaemon" />
@@ -248,7 +250,6 @@
         <option value="$PROJECT_DIR$/config/music.php" />
         <option value="$PROJECT_DIR$/config/media.php" />
         <option value="$PROJECT_DIR$/scripts/lib/remoteinfos.php" />
-        <option value="$PROJECT_DIR$/scripts/cron/cron.php" />
         <option value="$PROJECT_DIR$/scripts/lib/redis.php" />
         <option value="$PROJECT_DIR$/scripts/lib/tmdb.php" />
         <option value="$PROJECT_DIR$/scripts/tmdb.php" />
@@ -256,6 +257,9 @@
         <option value="$PROJECT_DIR$/scripts/lib/ssh.php" />
         <option value="$PROJECT_DIR$/composer.json" />
         <option value="$PROJECT_DIR$/servers/ssh.php" />
+        <option value="$PROJECT_DIR$/scripts/cron/cron.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/bricks.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/mediarasp.php" />
       </list>
     </option>
   </component>
@@ -951,21 +955,7 @@
       <workItem from="1562315270549" duration="3917000" />
       <workItem from="1562430904715" duration="18334000" />
       <workItem from="1562654595102" duration="11549000" />
-      <workItem from="1562710631719" duration="1860000" />
-    </task>
-    <task id="LOCAL-00147" summary=".">
-      <created>1550322012423</created>
-      <option name="number" value="00147" />
-      <option name="presentableId" value="LOCAL-00147" />
-      <option name="project" value="LOCAL" />
-      <updated>1550322012423</updated>
-    </task>
-    <task id="LOCAL-00148" summary=".">
-      <created>1550479125108</created>
-      <option name="number" value="00148" />
-      <option name="presentableId" value="LOCAL-00148" />
-      <option name="project" value="LOCAL" />
-      <updated>1550479125110</updated>
+      <workItem from="1562710631719" duration="5123000" />
     </task>
     <task id="LOCAL-00149" summary=".">
       <created>1550481681313</created>
@@ -1296,11 +1286,25 @@
       <option name="project" value="LOCAL" />
       <updated>1562739863351</updated>
     </task>
-    <option name="localTasksCounter" value="196" />
+    <task id="LOCAL-00196" summary=".">
+      <created>1562740088238</created>
+      <option name="number" value="00196" />
+      <option name="presentableId" value="LOCAL-00196" />
+      <option name="project" value="LOCAL" />
+      <updated>1562740088238</updated>
+    </task>
+    <task id="LOCAL-00197" summary=".">
+      <created>1562743327335</created>
+      <option name="number" value="00197" />
+      <option name="presentableId" value="LOCAL-00197" />
+      <option name="project" value="LOCAL" />
+      <updated>1562743327335</updated>
+    </task>
+    <option name="localTasksCounter" value="198" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1268303000" />
+    <option name="totallyTimeSpent" value="1271566000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1342,13 +1346,13 @@
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Maven Projects" order="4" />
       <window_info anchor="right" id="Properties" order="5" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32949126" />
+      <window_info anchor="right" id="Database" order="6" sideWeight="0.49868765" weight="0.22058824" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="right" id="Theme Preview" order="9" />
-      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48425198" visible="true" weight="0.14825119" />
+      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48293963" visible="true" weight="0.14825119" />
       <window_info anchor="right" id="SciView" order="11" weight="0.3298887" />
-      <window_info anchor="right" id="Structure" order="12" sideWeight="0.515748" side_tool="true" visible="true" weight="0.14825119" />
+      <window_info anchor="right" id="Structure" order="12" sideWeight="0.51706034" side_tool="true" visible="true" weight="0.14825119" />
       <window_info anchor="right" id="Data View" order="13" />
       <window_info anchor="right" id="Maven" order="14" />
     </layout>
@@ -1384,16 +1388,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/scripts/domoticz_device_event.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/bedroomlight.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/config/global.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
@@ -1453,20 +1447,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/seen.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="387" column="27" selection-start-line="387" selection-start-column="27" selection-end-line="387" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -1678,13 +1658,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="303" column="45" lean-forward="true" selection-start-line="303" selection-start-column="45" selection-end-line="303" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1722,8 +1695,47 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/servers/ssh.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="595">
-          <caret line="35" column="72" selection-start-line="35" selection-start-column="72" selection-end-line="35" selection-end-column="72" />
+        <state relative-caret-position="187">
+          <caret line="12" column="50" lean-forward="true" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/seen.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="68" selection-start-line="68" selection-end-line="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/remote.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-680" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/bricks.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="42" column="114" selection-start-line="42" selection-start-column="114" selection-end-line="42" selection-end-column="114" />
+          <folding>
+            <element signature="n#style#0;n#i#0;n#a#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#i#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="476">
+          <caret line="187" column="30" selection-start-line="187" selection-start-column="30" selection-end-line="187" selection-end-column="30" />
         </state>
       </provider>
     </entry>

diff --git a/scripts/lib/bricks.php b/scripts/lib/bricks.php
index 397c0df6c3511a35c7f209bdff4e9260dd94f63e..5854d13a1a5607601ba7e599ddd3d260520596ac 100644 (file)
--- a/scripts/lib/bricks.php
+++ b/scripts/lib/bricks.php
@@ -39,8 +39,8 @@ function getRemoteVolumeBrick($brick)
 function getRemoteSubtitlesBrick($brick)
 {
     $res = '<div class="line"><a href="#" data-remote-command="subtitles-stream-next" data-remote-command-long="subtitles-toggle"><i class="fas fa-closed-captioning"></i></a></div>';
-    $res .= '<div class="line"><a href="#" data-remote-command="subtitles-increase-delay"><i class="fas fa-plus"></i></a></div>';
-    $res .= '<div class="line"><a href="#" data-remote-command="subtitles-decrease-delay"><i class="fas fa-minus"></i></a></div>';
+    $res .= '<div class="line"><a href="#" data-remote-command="subtitles-increase-delay" data-remote-command-long="subtitles-increase-delay-long"><i class="fas fa-plus"></i></a></div>';
+    $res .= '<div class="line"><a href="#" data-remote-command="subtitles-decrease-delay" data-remote-command-long="subtitles-decrease-delay-long"><i class="fas fa-minus"></i></a></div>';
     return $res;
 }
 

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index e2895e0ddf1837b0a804f1255d2d3a98abbbc4b3..48f95de6f820a5b51dd593fb7840c8cc11c483ea 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -151,7 +151,11 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
         'subtitles-stream-next' => 'subtitles-stream-next',
         'subtitles-stream-prev' => 'subtitles-stream-prev',
         'subtitles-increase-delay' => 'subtitles-increase-delay',
-        'subtitles-decrease-delay' => 'subtitles-decrease-delay'];
+        'subtitles-increase-delay-long' => 'subtitles-increase-delay-long',
+        'subtitles-decrease-delay' => 'subtitles-decrease-delay',
+        'subtitles-decrease-delay-long' => 'subtitles-decrease-delay-long',
+
+    ];
 
 
     if ($device == 'bureau') {
@@ -175,9 +179,13 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
         } else if ($key == 'subtitles-stream-prev') {
             sendHotKey('alt+v');
         } else if ($key == 'subtitles-increase-delay') {
-            sendHotKey('h', 10);
+            sendHotKey('h', 5);
         } else if ($key == 'subtitles-decrease-delay') {
-            sendHotKey('g', 10);
+            sendHotKey('g', 5);
+        } else if ($key == 'subtitles-increase-delay-long') {
+            sendHotKey('h', 40);
+        } else if ($key == 'subtitles-decrease-delay-long') {
+            sendHotKey('g', 40);
         } else if ($key == 'rewind' || $key == 'fast-rewind' || $key == 'forward' || $key == 'fast-forward') {
             if ($key == 'rewind' || $key == 'forward') {
                 $amount = 15;