diff options
| author | ronie <ronie@poedel.net> | 2015-11-15 22:33:24 +0100 |
|---|---|---|
| committer | ronie <ronie@poedel.net> | 2015-11-15 22:33:24 +0100 |
| commit | 07f691e6ddccff40baff2c4b96dc9d907f761bbb (patch) | |
| tree | 3cb4d6cce73fc14681062068f87ff9e352f78665 /addons | |
| parent | 8b6a4b8047049b1733417958832e4d19aefd8173 (diff) | |
| parent | 4133a251131f986148975dae5e1e0f1f8309f059 (diff) | |
Merge pull request #8363 from robwebset/master
Support PlayingBackgroundMedia In Confluence
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/Home.xml | 5 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/IncludesBackgroundBuilding.xml | 3 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/includes.xml | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 9ac8edcc8f..ffa16dec51 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -24,7 +24,7 @@ <depth>DepthMenu</depth> <left>0</left> <top>60</top> - <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)</visible> + <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo) + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> <control type="image"> @@ -228,7 +228,7 @@ <depth>DepthMenu</depth> <left>0</left> <top>50</top> - <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)</visible> + <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo) + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> <control type="group"> @@ -462,6 +462,7 @@ <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" /> </animation> + <visible>IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> <control type="image"> <description>Background End image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index 63ad350164..cc996da50d 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -42,6 +42,7 @@ <width>1280</width> <height>720</height> <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible> + <visible>IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> </control> <control type="videowindow"> <depth>DepthBackground</depth> @@ -58,7 +59,7 @@ <width>1320</width> <height>120</height> <texture flipy="true" border="1">HomeNowPlayingBack.png</texture> - <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)] | [!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> </control> </include> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 3f49db724d..6154de0b47 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -432,7 +432,7 @@ </include> <include name="CommonNowPlaying"> <control type="group"> - <visible>Player.HasMedia</visible> + <visible>Player.HasMedia + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> <include>VisibleFadeEffect</include> <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> |