Skip to content

Commit

Permalink
added debug stats to fullscreen windows (music viz, video fullscreen …
Browse files Browse the repository at this point in the history 
…etc.)
  • Loading branch information
@byron42
byron42 committed Sep 22, 2015
1 parent ad99183 commit 1679202
Show file tree
Hide file tree
Showing 9 changed files with 432 additions and 282 deletions.
22 changes: 14 additions & 8 deletions 720p/DialogSeekBar.xml
View file
Expand Up @@ -10,13 +10,13 @@
<!--OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO-->

<!--DialogOpenCloseAnim-->
<animation condition="![[Window.IsVisible(2005) + Player.ShowInfo] | [Window.IsActive(2006) + Player.ShowInfo] | Window.IsVisible(114) | Window.IsVisible(script-XBMC_Lyrics-main.xml)]" type="VisibleChange">
<animation condition="![[VideoPlayer.IsFullscreen + Player.ShowInfo] | [Window.IsActive(2006) + Player.ShowInfo] | Window.IsVisible(114) | Window.IsVisible(script-XBMC_Lyrics-main.xml)]" type="VisibleChange">
<effect type="fade" end="100" time="150"/>
<!-- <effect type="slide" start="0,-45" time="200" tween="circle" easing="out"/> -->
</animation>

<!--*************** for FullScreenInfo's (and player controls!) update ********************************-->
<animation effect="fade" end="100" time="0" condition="[[Window.IsVisible(2005) + Player.ShowInfo] | [Window.IsActive(2006) + Player.ShowInfo] | Window.IsVisible(114)] + Player.Seeking + [!Player.Paused | Player.Paused]">VisibleChange</animation>
<animation effect="fade" end="100" time="0" condition="[[VideoPlayer.IsFullscreen + Player.ShowInfo] | [Window.IsActive(2006) + Player.ShowInfo] | Window.IsVisible(114)] + Player.Seeking + [!Player.Paused | Player.Paused]">VisibleChange</animation>
<!--***************************************************************************************************-->

<coordinates>
Expand All @@ -35,7 +35,7 @@
<!--little dialog fade out-->
<animation effect="fade" start="100" end="30" delay="0" time="200" condition="Window.IsActive(100) | Window.IsActive(contextmenu) | Window.IsActive(numericinput) | Window.IsActive(101) | Window.IsActive(2002)">Conditional</animation>
<!---->
<animation effect="fade" start="0" end="0" time="0" easing="out" condition="[Window.IsVisible(Home) | [Window.IsVisible(2005) + Player.ShowInfo] | [Window.IsVisible(2005) + Player.ShowCodec] | [Window.IsActive(2006) + Player.ShowInfo + !Player.ShowCodec] | Window.IsVisible(114) | Control.IsVisible(6002)]">Conditional</animation>
<animation effect="fade" start="100" end="0" time="0" easing="out" condition="[Window.IsVisible(Home) | [VideoPlayer.IsFullscreen + Player.ShowInfo] | [VideoPlayer.IsFullscreen + Player.ShowCodec] | [Window.IsActive(2006) + Player.ShowInfo + !Player.ShowCodec] | Window.IsVisible(114) | Control.IsVisible(6002)]">Conditional</animation>
<!--OSDOpenCloseAnim-->
<animation effect="fade" start="0" end="100" time="250" easing="out">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="250" easing="out">WindowClose</animation>
Expand Down Expand Up @@ -161,18 +161,23 @@
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>slider_nibFO.png</textureslidernib>
<textureslidernibfocus>slider_nibFO.png</textureslidernibfocus>
<visible>true</visible>
<!-- <visible>true</visible> -->
<onup>1</onup>
<ondown>1</ondown>
<onleft>1</onleft>
<onright>1</onright>
<visible>![Window.IsVisible(Home) | [Window.IsVisible(2005) + Player.ShowInfo] | [Window.IsActive(2006) + Player.ShowInfo + !Player.ShowCodec] | Window.IsVisible(114) | Control.IsVisible(6002) | Window.IsVisible(script-XBMC_Lyrics-main.xml)]</visible>
<visible>![Window.IsVisible(Home) | [VideoPlayer.IsFullscreen + Player.ShowInfo] | [Window.IsActive(2006) + Player.ShowInfo + !Player.ShowCodec] | Window.IsVisible(114) | Control.IsVisible(6002) | Window.IsVisible(script-XBMC_Lyrics-main.xml)]</visible>
<animation effect="fade" start="0" end="100" time="10">VisibleChange</animation>
</control>
</control>
<!--******** HACKED!!! ************************-->
<control type="group">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,27" condition="Skin.HasSetting(ShowSystemVitals) + !Window.IsActive(script-XBMC_Lyrics-main.xml)">Conditional</animation>
<animation effect="slide" end="0,-27" condition="Window.IsActive(Home) + !Window.IsActive(PlayerControls) + Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<animation effect="slide" end="0,27" condition="Window.IsActive(Home) + Skin.HasSetting(NowPlayingAlignTop) + !Window.IsActive(PlayerControls) + Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<!--normal zoom for video/no music cd-->
<animation effect="zoom" start="300,715r,1280,720" end="300,715r,1080,720" time="150" condition="[Player.HasVideo + !Window.IsActive(2901) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]] | [[Player.HasAudio + !Skin.HasSetting(HidecdArt)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]]">VisibleChange</animation>
<animation effect="zoom" start="300,715r,1280,720" end="300,715r,1080,720" time="150" condition="[VideoPlayer.IsFullscreen + !Window.IsVisible(2901) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]] | [[Player.HasAudio + !Skin.HasSetting(HidecdArt)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]]">VisibleChange</animation>
<!--zoom for no music cd specific-->
<animation effect="zoom" start="285,715r,1280,720" end="285,715r,1095,720" time="150" condition="Player.HasAudio + !Window.IsVisible(script-XBMC_Lyrics-main.xml) + [Skin.HasSetting(HidecdArt) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]]">VisibleChange</animation>
<!--empty thumb/no cd-->
Expand Down Expand Up @@ -200,7 +205,8 @@
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>slider_nibFO.png</textureslidernib>
<textureslidernibfocus>slider_nibFO.png</textureslidernibfocus>
<visible>[Window.IsVisible(script-XBMC_Lyrics-main.xml) | [Window.IsVisible(2005) + Player.ShowInfo] | [Window.IsVisible(2006) + Player.ShowInfo + !Player.ShowCodec] | Window.IsVisible(114) | [Window.IsActive(Home) + [!Skin.HasSetting(HideNowPlayingMedia) | Window.IsActive(PlayerControls)]]]] + Player.Seeking + [!Player.Paused | Player.Paused]</visible>
<visible>[Window.IsVisible(script-XBMC_Lyrics-main.xml) | [VideoPlayer.IsFullscreen + Player.ShowInfo] | [Window.IsVisible(2006) + Player.ShowInfo + !Player.ShowCodec] | Window.IsVisible(114) | [Window.IsActive(Home) + [!Skin.HasSetting(HideNowPlayingMedia) | Window.IsActive(PlayerControls)]]] + Player.Seeking + [!Player.Paused | Player.Paused]</visible>
<animation effect="fade" start="0" end="100" time="10">VisibleChange</animation>
<onup>1</onup>
<ondown>1</ondown>
<onleft>1</onleft>
Expand All @@ -222,7 +228,7 @@
<posy>-65</posy>
<animation effect="fade" start="0" end="100" time="200" >Visible</animation>
<animation effect="fade" start="100" end="0" time="200" >Hidden</animation>
<visible>!Player.Paused + ![Window.IsActive(Home) | Window.IsActive(FullScreenVideo) | Window.IsActive(Visualisation) | [Window.IsVisible(114) + Player.Seeking + [!Player.Paused | Player.Paused]]]</visible>
<visible>!Player.Paused + ![Window.IsActive(FullScreenVideo) | Window.IsActive(Visualisation) | [Window.IsVisible(114) + Player.Seeking + [!Player.Paused | Player.Paused]]]</visible>
<control type="progress">
<description>Cache Progress</description>
<width>1280</width>
Expand Down
5 changes: 3 additions & 2 deletions 720p/Includes_SystemStatistics.xml
View file
@@ -1,7 +1,8 @@
<includes>
<include name="System_Vitals_Bar">
<control type="group">
<animation effect="fade" start="100" end="100" time="0" condition="Player.HasMedia">Conditional</animation>
<control type="group" id="1">
<animation effect="slide" end="0,-44" condition="!Window.IsActive(shutdownmenu) + [Window.IsVisible(playercontrols) | Window.IsVisible(videoosd) | Window.IsVisible(musicosd) | Window.IsVisible(visualisation) | Window.IsVisible(fullscreenvideo)]">Conditional</animation>
<animation effect="fade" start="0" end="100" time="200" condition="Window.Next(playercontrols)">Conditional</animation>
<description>VITALS</description>
<posy>MenuBarOffsetY</posy>
<control type="image" id="1110">
Expand Down
8 changes: 8 additions & 0 deletions 720p/MusicOSD.xml
View file
Expand Up @@ -27,6 +27,8 @@
<animation effect="fade" start="100" end="30" delay="0" time="200" condition="Window.IsActive(100) | Window.IsActive(contextmenu) | Window.IsActive(numericinput) | Window.IsActive(101) | Window.IsActive(2002)">Conditional</animation>

<control type="group">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,27" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<visible>!Window.IsActive(111) | !Window.IsActive(121) | !Window.IsActive(122) | !Window.IsActive(script-XBMC_Lyrics-main.xml)</visible>
<!--HomeMenuPaneOpenCloseAnim-->
<animation effect="slide" start="0,-120" end="0,-10" time="250" tween="circle" easing="out">WindowOpen</animation>
Expand Down Expand Up @@ -110,6 +112,8 @@

<!--viz select menu-->
<control type="grouplist">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,13" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<posx>320</posx>
<posy>320</posy>
<itemgap>10</itemgap>
Expand Down Expand Up @@ -156,6 +160,10 @@
</control>
</control>

<!--************* SystemStatistics *************-->
<include>System_Vitals_Bar</include>
<!--********************************************-->

</control>
</controls>
</window>
15 changes: 14 additions & 1 deletion 720p/MusicVisualisation.xml
View file
Expand Up @@ -38,6 +38,8 @@

<!--********************************************** CODEC BOX ***************************************************************-->
<control type="group" id="4501">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,27" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<posx></posx>
<posy>-10</posy>
<!--VisibleFadeEffect-->
Expand All @@ -51,6 +53,9 @@
<visible>Player.ShowCodec + ![Window.IsActive(120) | Window.IsVisible(121) | Window.IsVisible(122)]</visible>
<control type="group">
<control type="image">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,-27" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<animation effect="zoom" start="-30,0,1360,155" end="-30,0,1360,182" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<description>gradient</description>
<posx>-30</posx>
<posy>0</posy>
Expand Down Expand Up @@ -192,6 +197,8 @@

<!--(((ShowInfo)))=====================================================================================================================-->
<control type="group" id="4500">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,27" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<!-- shutdown specific -->
<animation effect="fade" start="100" end="0" time="151" condition="Window.IsActive(Shutdownmenu)">Conditional</animation>
<!---->
Expand All @@ -200,7 +207,8 @@
<animation effect="fade" end="100" time="250" delay="50" condition="Window.IsActive(120)">VisibleChange</animation>
<animation effect="slide" start="0,0" end="0,-400" time="250" delay="0" tween="quadratic" easing="out">WindowClose</animation>
<!-- musicOSD visible slide -->
<animation effect="slide" end="0,285" time="250" tween="circle" easing="out" condition="Window.IsActive(120)">Conditional</animation>
<animation effect="slide" end="0,285" time="250" tween="circle" easing="out" condition="Window.IsActive(120) + !Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<animation effect="slide" end="0,273" time="250" tween="circle" easing="out" condition="Window.IsActive(120) + Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<!-- musicOSD visible/window.next vis settings/presets -->
<animation effect="fade" start="100" end="0" time="250" delay="100" condition="Window.IsActive(121) | Window.IsActive(122)">Conditional</animation>
<visible>Player.ShowInfo + !Window.IsVisible(script-XBMC_Lyrics-main.xml) + !Control.IsVisible(4501)</visible>
Expand Down Expand Up @@ -521,6 +529,11 @@
</control>
</control>
</control>

<!--************* SystemStatistics *************-->
<include>System_Vitals_Bar</include>
<!--********************************************-->

</control>
</controls>
</window>
35 changes: 11 additions & 24 deletions 720p/PlayerControls.xml
View file
Expand Up @@ -59,6 +59,9 @@

<!--(((NowPlaying)))=====================================================================================================================-->
<control type="group">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,27" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<!---->
<animation effect="slide" start="0,-400" end="0,0" time="250" tween="quadratic" easing="out">WindowOpen</animation>
<animation effect="slide" start="0,0" end="0,-400" time="250" delay="0" tween="quadratic" easing="out">WindowClose</animation>
<visible>!Window.IsActive(SlideShow)</visible>
Expand All @@ -71,6 +74,9 @@
<posx></posx>
<posy></posy>
<control type="image">
<!--SkinSystemStatMenuSlide-->
<animation effect="slide" end="0,-27" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<animation effect="zoom" start="0,0,1300,200" end="0,0,1300,227" condition="Skin.HasSetting(ShowSystemVitals)">Conditional</animation>
<description>media info background image</description>
<posx>-10</posx>
<posy>-38</posy>
Expand All @@ -86,19 +92,6 @@
<animation effect="fade" start="0" end="100" time="250" delay="50">Visible</animation>
<animation effect="fade" start="100" end="0" time="250" >Hidden</animation>
<visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding</visible>
<!-- <control type="label">
<description>PlayerControlLabel</description>
<posx>815</posx>
<posy>115</posy>
<width>160</width>
<height>100</height>
<align>center</align>
<textwidth>160</textwidth>
<font>font_22_CB</font>
<textcolor>gray</textcolor>
<shadowcolor>black</shadowcolor>
<label>$VAR[PlayerControlActionLabel]</label>
</control> -->
<control type="image" id="1000">
<description>PlayerControlImage</description>
<posx>842</posx>
Expand Down Expand Up @@ -381,17 +374,6 @@
<bordersize>8</bordersize>
<visible>Skin.HasSetting(HidecdArt)</visible>
</control>
<!-- <control type="image">
<description>cover image</description>
<posx>25</posx>
<posy>700r</posy>
<width>235</width>
<height>215</height>
<texture>defaultaudio.png</texture>
<aspectratio aligny="top">stretch</aspectratio>
<bordertexture border="15">Glass/keyfocus.png</bordertexture>
<visible>IsEmpty(ListItem.Thumb)</visible>
</control> -->
</control>
</control>
</control>
Expand Down Expand Up @@ -469,6 +451,11 @@
<shadowcolor></shadowcolor>
</control>
</control>

<!--************* SystemStatistics *************-->
<include>System_Vitals_Bar</include>
<!--********************************************-->

</control>
<!--PLOT ARTIST/ALBUM INFO-->
<control type="group" id="5001">
Expand Down

0 comments on commit 1679202

Please sign in to comment.