Skip to content

Commit

Permalink
Clean up the way PlayingBackgroundMedia is read
Browse files Browse the repository at this point in the history
  • Loading branch information
@robwebset @popcornmix
robwebset authored and popcornmix committed Jul 3, 2015
1 parent 72a1bcd commit a61b378
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions addons/skin.confluence/720p/Home.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<control type="group"> <control type="group">
<left>0</left> <left>0</left>
<top>60</top> <top>60</top>
<visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo) + !SubString(Window(videolibrary).Property(PlayingBackgroundMedia),True)</visible> <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo) + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<include>Window_OpenClose_Animation</include> <include>Window_OpenClose_Animation</include>
<control type="image"> <control type="image">
Expand Down Expand Up @@ -233,7 +233,7 @@
<control type="group"> <control type="group">
<left>0</left> <left>0</left>
<top>50</top> <top>50</top>
<visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo) + !SubString(Window(videolibrary).Property(PlayingBackgroundMedia),True)</visible> <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo) + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<include>Window_OpenClose_Animation</include> <include>Window_OpenClose_Animation</include>
<control type="group"> <control type="group">
Expand Down Expand Up @@ -466,7 +466,7 @@
<effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" />
<effect type="fade" start="100" end="0" time="225" /> <effect type="fade" start="100" end="0" time="225" />
</animation> </animation>
<visible>!SubString(Window(videolibrary).Property(PlayingBackgroundMedia),True)</visible> <visible>IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
<control type="image"> <control type="image">
<description>Background End image</description> <description>Background End image</description>
<left>0</left> <left>0</left>
Expand Down
4 changes: 2 additions & 2 deletions addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<width>1280</width> <width>1280</width>
<height>720</height> <height>720</height>
<visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible> <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible>
<visible>!SubString(Window(videolibrary).Property(PlayingBackgroundMedia),True)</visible> <visible>IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
</control> </control>
<control type="videowindow"> <control type="videowindow">
<left>0</left> <left>0</left>
Expand All @@ -66,7 +66,7 @@
<width>1280</width> <width>1280</width>
<height>120</height> <height>120</height>
<texture flipy="true" border="1">HomeNowPlayingBack.png</texture> <texture flipy="true" border="1">HomeNowPlayingBack.png</texture>
<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | SubString(Window(videolibrary).Property(PlayingBackgroundMedia),True)]] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible> <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | !IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))]] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
</control> </control>
</include> </include>
Expand Down
2 changes: 1 addition & 1 deletion addons/skin.confluence/720p/includes.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
</include> </include>
<include name="CommonNowPlaying"> <include name="CommonNowPlaying">
<control type="group"> <control type="group">
<visible>Player.HasMedia + !SubString(Window(videolibrary).Property(PlayingBackgroundMedia),True)</visible> <visible>Player.HasMedia + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation>
<animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation>
Expand Down

0 comments on commit a61b378

Please sign in to comment.