.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 63e7e02b0437704d8db82ed10bb564de11a73cff..b29d71bd21e34c194e68a7e01c8c344c82aca395 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <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/freeboxchannel.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/freeboxchannel.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="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -779,14 +779,8 @@
       <workItem from="1577785483253" duration="3506000" />
       <workItem from="1577891426611" duration="8746000" />
       <workItem from="1578343490755" duration="8304000" />
-      <workItem from="1578429518225" duration="1227000" />
-    </task>
-    <task id="LOCAL-00222" summary=".">
-      <created>1567582046066</created>
-      <option name="number" value="00222" />
-      <option name="presentableId" value="LOCAL-00222" />
-      <option name="project" value="LOCAL" />
-      <updated>1567582046067</updated>
+      <workItem from="1578429518225" duration="1270000" />
+      <workItem from="1578473134474" duration="754000" />
     </task>
     <task id="LOCAL-00223" summary=".">
       <created>1567583577405</created>
@@ -1124,7 +1118,14 @@
       <option name="project" value="LOCAL" />
       <updated>1578429849669</updated>
     </task>
-    <option name="localTasksCounter" value="271" />
+    <task id="LOCAL-00271" summary=".">
+      <created>1578472489576</created>
+      <option name="number" value="00271" />
+      <option name="presentableId" value="LOCAL-00271" />
+      <option name="project" value="LOCAL" />
+      <updated>1578472489576</updated>
+    </task>
+    <option name="localTasksCounter" value="272" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1191,12 +1192,12 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1577787700897" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1578429518793">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1578473135400">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1578429518793" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1578473135400" />
     <state x="976" y="257" width="607" height="536" key="find.popup" timestamp="1578382838515">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index a8f1da6fd6c47651ffeb284923ba025214c85308..8c3292dc0d7eafd3bb96d5bb9bac36fa9a66449f 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -345,9 +345,17 @@ function mediaRaspPlayCast($castURL, $device = null)
     if (null === $device) {
         $device = config('DEVICE');
     }
+    if ($device === 'bureau') {
+        $height = 720;
+    } else if ($device === 'salon') {
+        $height = 1080;
+    } else {
+        $height = 640;
+    }
+
     setPlaying('mediarasp:cast:' . $castURL);
     mediaRaspCommons($device);
-    $dest = downloadYoutubeDL($castURL, 1080, true, 'mkv');
+    $dest = downloadYoutubeDL($castURL, $height, true, 'mkv');
     getYoutubeDLMeta($castURL);
     $res = VLCPlay($dest, $device);
     mediaRaspPostPlay($device);