[AutoTrailer] improvements (#706)

beatmasterRS · Jan 14, 2022 · be2cdb4 · be2cdb4
1 parent 9d4ea43
commit be2cdb4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -533,14 +533,18 @@
             <include>Dimensions_Fullscreen</include>
             <texture colordiffuse="Background">common/bg.jpg</texture>
         </control>
+        <include condition="Skin.HasSetting(global.showvideo)">VideoWindow</include>
+    </include>
+
+    <include name="VideoWindow">
         <control type="image" description="Background">
             <include>Dimensions_Fullscreen</include>
             <texture colordiffuse="ff000000">common/white.png</texture>
-            <visible>Player.HasVideo + Skin.HasSetting(global.showvideo)</visible>
+            <visible>Player.HasVideo + !$EXP[TrailerIsPlaying]</visible>
         </control>
         <control type="videowindow">
             <include>Dimensions_Fullscreen</include>
-            <visible>Player.HasVideo + Skin.HasSetting(global.showvideo)</visible>
+            <visible>Player.HasVideo + !$EXP[TrailerIsPlaying]</visible>
         </control>
     </include>
 
@@ -696,18 +700,10 @@
 
     <include name="TrailerWindow">
         <control type="videowindow">
-            <visible>$EXP[TrailerWindowIsActive] + !$EXP[ExtendedNowPlayingIsVisible] + ![$EXP[HomeIsCleanMinimal] + Window.IsVisible(Home)]</visible>
-            <width>1280</width>
-            <height>720</height>
-            <right>0</right>
-            <top>0</top>
-            <animation effect="slide" start="0,0" end="0,-90" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window.force)">Conditional</animation>
-            <animation effect="slide" start="0,0" end="0,-50" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window) + String.IsEqual(VideoPlayer.VideoAspect,1.85) + !String.IsEmpty(VideoPlayer.VideoAspect)">Conditional</animation>
-            <animation effect="slide" start="0,0" end="0,-90" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window) + !String.IsEqual(VideoPlayer.VideoAspect,1.85) + !String.IsEqual(VideoPlayer.VideoAspect,1.78) + !String.IsEqual(VideoPlayer.VideoAspect,1.66) + !String.IsEqual(VideoPlayer.VideoAspect,1.37) + !String.IsEqual(VideoPlayer.VideoAspect,1.33) + !String.IsEmpty(VideoPlayer.VideoAspect)">Conditional</animation>
-            <animation type="WindowClose" reversible="false">
-                <effect type="zoom" center="auto" start="100" end="0" time="0" />
-            </animation>
-        </control>
+            <visible>$EXP[TrailerWindowIsActive] + !$EXP[ExtendedNowPlayingIsVisible]</visible>
+            <include condition="![$EXP[HomeIsCleanMinimal] + Window.IsVisible(Home)]">DefTrailerVideoWindowSmall</include>
+            <include condition="$EXP[HomeIsCleanMinimal] + Window.IsVisible(Home)">DefTrailerVideoWindowFullscreen</include>
+        </control>        
         <control type="image" description="Background">
             <animation effect="slide" start="0,0" end="0,-90" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window.force)">Conditional</animation>
             <animation effect="slide" start="0,0" end="0,-50" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window) + String.IsEqual(VideoPlayer.VideoAspect,1.85) + !String.IsEmpty(VideoPlayer.VideoAspect)">Conditional</animation>
@@ -717,10 +713,6 @@
             <include>Dimensions_Fullscreen</include>
             <texture colordiffuse="Background">common/trailerwindow.png</texture>
         </control>
-        <control type="videowindow">
-            <visible>$EXP[TrailerWindowIsActive] + !$EXP[ExtendedNowPlayingIsVisible] + $EXP[HomeIsCleanMinimal] + Window.IsVisible(Home)</visible>
-            <include>Dimensions_Fullscreen</include>
-        </control>
     </include>
 
     <include name="BlurImageEmbuary">
@@ -729,8 +721,8 @@
             <right>-3000</right>
             <width>10</width>
             <height>10</height>
-            <texture background="true">$VAR[GlobalFanart]</texture> 
-            <visible>!Window.IsVisible(Custom_Blur.xml)</visible>           
+            <texture background="true">$VAR[GlobalFanart]</texture>
+            <visible>!Window.IsVisible(Custom_Blur.xml)</visible>
         </control>
     </include>
 

diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
@@ -4955,4 +4955,21 @@
         <onclick>RunScript(script.embuary.helper,action=blurimg,file='"$VAR[CustomBlurImage]"',prop=BlurImage)</onclick>
         <onclick>Close</onclick>
     </include>
+
+    <include name="DefTrailerVideoWindowSmall">
+        <width>1280</width>
+        <height>720</height>
+        <right>0</right>
+        <top>0</top>
+        <animation effect="slide" start="0,0" end="0,-90" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window.force)">Conditional</animation>
+        <animation effect="slide" start="0,0" end="0,-50" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window) + String.IsEqual(VideoPlayer.VideoAspect,1.85) + !String.IsEmpty(VideoPlayer.VideoAspect)">Conditional</animation>
+        <animation effect="slide" start="0,0" end="0,-90" time="0" condition="Skin.HasSetting(home.netflix.autoplay.trailer.custom.window) + !String.IsEqual(VideoPlayer.VideoAspect,1.85) + !String.IsEqual(VideoPlayer.VideoAspect,1.78) + !String.IsEqual(VideoPlayer.VideoAspect,1.66) + !String.IsEqual(VideoPlayer.VideoAspect,1.37) + !String.IsEqual(VideoPlayer.VideoAspect,1.33) + !String.IsEmpty(VideoPlayer.VideoAspect)">Conditional</animation>
+        <animation type="WindowClose" reversible="false">
+            <effect type="zoom" center="auto" start="100" end="0" time="0" />
+        </animation>
+    </include>
+
+    <include name="DefTrailerVideoWindowFullscreen">
+        <include>Dimensions_Fullscreen</include>
+    </include>
 </includes>