From: Vincent <vincent@enhydra.fr>
Date: Mon, 23 Nov 2020 07:23:22 +0000 (+0100)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2a1fcae9daf45d57c36e9b868f088da017c9df23;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 07b3a21..6d14800 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +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$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/insteon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/insteon.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/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -906,14 +905,9 @@
       <workItem from="1605597648537" duration="7658000" />
       <workItem from="1605690676577" duration="7108000" />
       <workItem from="1605973078856" duration="4741000" />
-      <workItem from="1606049944658" duration="4056000" />
-    </task>
-    <task id="LOCAL-00361" summary=".">
-      <created>1604237480617</created>
-      <option name="number" value="00361" />
-      <option name="presentableId" value="LOCAL-00361" />
-      <option name="project" value="LOCAL" />
-      <updated>1604237480617</updated>
+      <workItem from="1606049944658" duration="4067000" />
+      <workItem from="1606074617916" duration="1140000" />
+      <workItem from="1606112202214" duration="661000" />
     </task>
     <task id="LOCAL-00362" summary=".">
       <created>1604253174045</created>
@@ -1251,7 +1245,14 @@
       <option name="project" value="LOCAL" />
       <updated>1606050006824</updated>
     </task>
-    <option name="localTasksCounter" value="410" />
+    <task id="LOCAL-00410" summary=".">
+      <created>1606074001062</created>
+      <option name="number" value="00410" />
+      <option name="presentableId" value="LOCAL-00410" />
+      <option name="project" value="LOCAL" />
+      <updated>1606074001062</updated>
+    </task>
+    <option name="localTasksCounter" value="411" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1298,12 +1299,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="1606050001261">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1606073997479">
       <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="1606050001261" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1606073997479" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605726960903">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1314,11 +1315,11 @@
     </state>
     <state x="743" y="392" key="NewPhpFileDialog/0.0.1707.920@0.0.1707.920" timestamp="1604238041494" />
     <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1605344146097" />
-    <state x="546" y="120" key="SettingsEditor" timestamp="1605087773918">
+    <state x="546" y="120" key="SettingsEditor" timestamp="1606112187843">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="364" y="106" key="SettingsEditor/0.0.1707.920@0.0.1707.920" timestamp="1605086910920" />
-    <state x="546" y="120" key="SettingsEditor/0.0.2560.1040@0.0.2560.1040" timestamp="1605087773918" />
+    <state x="546" y="120" key="SettingsEditor/0.0.2560.1040@0.0.2560.1040" timestamp="1606112187843" />
     <state width="498" height="446" key="SwitcherDM" timestamp="1604228166964">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index b816261..531f69c 100644
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -57,7 +57,7 @@ function remoteCmd($cmd, $device)
     }
 
     if ((($p === 'netflix' || $p === 'tv') && config('TVPLAYER') === 'shield') || config('VIDEOPLAYER') === 'shield') {
-        return shieldRemoteCommand($cmd,$device);
+        return shieldRemoteCommand($cmd, $device);
     } else if ($device == 'salon') {
         switch (getCurrentHarmonyActivity()) {
             case 'media':
@@ -253,8 +253,7 @@ function remoteCmdSalonMusique($cmd)
 
 function mediaRaspPlayMovie($movie, $device = null)
 {
-    global $squeezeboxPlayers;
-
+    stopPlayersIn($device);
     setPlaying('mediarasp:' . $movie, $device);
     mediaRaspCommons($device);
 
diff --git a/scripts/lib/remoteinfos.php b/scripts/lib/remoteinfos.php
index 85ca75e..c20f619 100644
--- a/scripts/lib/remoteinfos.php
+++ b/scripts/lib/remoteinfos.php
@@ -4,6 +4,16 @@ function remoteInfos()
     $playing = getPlaying();
     $e = explode(':', $playing, 2);
     $p = $e[0];
+
+    if (config('TVPLAYER') === 'shield') {
+        $visualApps = ['arte', 'francetv', 'mycanal', 'youtube', 'dailymotion', 'vimeo', 'kodi', 'vlc'];
+        if (in_array(shieldGetCurrentApp(), $visualApps)) {
+            if ($p === 'squeezebox') {
+                setPlaying('shield');
+            }
+        }
+    }
+
     if ($p == 'squeezebox') {
         $res = squeezeboxRemoteInfos();
     } else {