aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjezz_x <jezz_x@svn>2010-02-15 23:56:46 +0000
committerjezz_x <jezz_x@svn>2010-02-15 23:56:46 +0000
commitb0cd953d353375e70880f85148d82bdcd10d0498 (patch)
treecf3099b337164bcfe0d55e901884d721790323d0
parentb17e879855dc3e2da3dd44b885b290ce7b231c14 (diff)
Changed : [Confluence] Completely redid the look of full screen media info
Added : [Confluence] Codec and channel count images to music full screen info Added : [Confluence] A bunch more Codec Flagging Images Changed : [Confluence] Cleaned up the code for the codec images (may result in blank spaces for missing codec images but makes it easier to add them) git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27864 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat
-rw-r--r--skin/Confluence/720p/DialogFullScreenInfo.xml577
-rw-r--r--skin/Confluence/720p/DialogSeekBar.xml3
-rw-r--r--skin/Confluence/720p/IncludesCodecFlagging.xml95
-rw-r--r--skin/Confluence/720p/MusicVisualisation.xml464
-rw-r--r--skin/Confluence/media/flagging/audio/aif.pngbin0 -> 2690 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/aifc.pngbin0 -> 2701 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/aiff.pngbin0 -> 2700 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/ape.pngbin0 -> 3901 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/avc.pngbin0 -> 2681 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/cdda.pngbin0 -> 4239 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/dca.pngbin0 -> 6103 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/flac.pngbin0 -> 4000 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/mp1.pngbin0 -> 2795 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/mp2.pngbin0 -> 3034 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/ogg.pngbin0 -> 3235 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/truehd.pngbin0 -> 10544 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/wma.pngbin0 -> 6497 bytes
-rw-r--r--skin/Confluence/media/flagging/audio/wmav2.pngbin0 -> 6537 bytes
-rw-r--r--skin/Confluence/media/flagging/video/flv.pngbin0 -> 6022 bytes
19 files changed, 316 insertions, 823 deletions
diff --git a/skin/Confluence/720p/DialogFullScreenInfo.xml b/skin/Confluence/720p/DialogFullScreenInfo.xml
index a0f81d6310..32ea9da51c 100644
--- a/skin/Confluence/720p/DialogFullScreenInfo.xml
+++ b/skin/Confluence/720p/DialogFullScreenInfo.xml
@@ -2,163 +2,125 @@
<defaultcontrol always="true">603</defaultcontrol>
<controls>
<control type="group">
- <animation effect="slide" start="0,160" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <animation effect="slide" start="0,0" end="0,160" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,0" end="0,160" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)">Conditional</animation>
+ <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
+ <animation effect="fade" start="100" end="0" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)">Conditional</animation>
<control type="image">
<description>media info background image</description>
<posx>0</posx>
- <posy>160r</posy>
+ <posy>270r</posy>
<width>1280</width>
- <height>256</height>
- <texture>MediaInfoBackLower.png</texture>
+ <height>270</height>
+ <texture>HomeNowPlayingBack.png</texture>
+ </control>
+ <control type="image">
+ <description>media info background image</description>
+ <posx>0</posx>
+ <posy>270r</posy>
+ <width>1280</width>
+ <height>270</height>
+ <colordiffuse>88FFFFFF</colordiffuse>
+ <texture>HomeNowPlayingBack.png</texture>
+ </control>
+ <control type="image">
+ <description>Non Movie cover image</description>
+ <posx>10</posx>
+ <posy>290r</posy>
+ <width>340</width>
+ <height>260</height>
+ <fadetime>200</fadetime>
+ <texture background="true">$INFO[VideoPlayer.Cover]</texture>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <bordertexture border="8">ThumbShadow.png</bordertexture>
+ <bordersize>8</bordersize>
+ <visible>!VideoPlayer.Content(Movies)</visible>
+ </control>
+ <control type="image">
+ <description>Movie cover image</description>
+ <posx>10</posx>
+ <posy>350r</posy>
+ <width>340</width>
+ <height>320</height>
+ <fadetime>200</fadetime>
+ <texture background="true">$INFO[VideoPlayer.Cover]</texture>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <bordertexture border="8">ThumbShadow.png</bordertexture>
+ <bordersize>8</bordersize>
+ <visible>VideoPlayer.Content(Movies)</visible>
+ </control>
+ <control type="progress">
+ <description>Progressbar</description>
+ <posx>10</posx>
+ <posy>30r</posy>
+ <width>340</width>
+ <height>14</height>
+ <info>Player.Progress</info>
</control>
<control type="group">
- <posx>380</posx>
- <posy>135r</posy>
- <!-- Stuff to fill in for seekbar not being visible -->
- <control type="label">
- <description>Playing Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>31040</label>
- <visible>Player.Playing + !Player.Seeking</visible>
- </control>
- <control type="label">
- <description>Paused Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>31043</label>
- <visible>[Player.Paused + !Player.Caching] + !Player.Seeking</visible>
- </control>
- <control type="label">
- <description>Cache Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
- <visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
- </control>
- <control type="label">
- <description>Seeking Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</label>
- <visible>Player.Seeking</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x2</label>
- <visible>Player.Forwarding2x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x4</label>
- <visible>Player.Forwarding4x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x8</label>
- <visible>Player.Forwarding8x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x16</label>
- <visible>Player.Forwarding16x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x32</label>
- <visible>Player.Forwarding32x</visible>
- </control>
- <control type="label">
- <description>RW Label</description>
- <posx>0</posx>
+ <posx>370</posx>
+ <posy>180r</posy>
+ <control type="grouplist">
+ <description>Media Codec Flagging Images</description>
+ <posx>340</posx>
<posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x2</label>
- <visible>Player.Rewinding2x</visible>
+ <width>550</width>
+ <align>right</align>
+ <itemgap>0</itemgap>
+ <orientation>horizontal</orientation>
+ <control type="image">
+ <description>Video rez Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
+ </control>
+
+ <control type="image">
+ <description>Common Codec Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[VideoPlayer.VideoCodec,flagging/video/,.png]</texture>
+ <!-- Don't show if its one of the 500 divx codecs -->
+ <visible>![substring(VideoPlayer.VideoCodec,divx) | substring(VideoPlayer.VideoCodec,div3) |substring(VideoPlayer.VideoCodec,div4) | substring(VideoPlayer.VideoCodec,div5)]</visible>
+ </control>
+ <control type="image">
+ <description>Divx Codec Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>flagging/video/divx.png</texture>
+ <visible>substring(VideoPlayer.VideoCodec,divx) | substring(VideoPlayer.VideoCodec,div3) |substring(VideoPlayer.VideoCodec,div4) | substring(VideoPlayer.VideoCodec,div5)</visible>
+ </control>
+
+ <control type="image">
+ <description>Dolby Digital Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>flagging/audio/dolbydigital.png</texture>
+ <visible>[substring(VideoPlayer.AudioCodec,ac3) + substring(VideoPlayer.AudioChannels,6)]</visible>
+ </control>
+ <control type="image">
+ <description>Audio Codec Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
+ <!-- Don't show if I want the Dolby Digital Logo -->
+ <visible>![substring(VideoPlayer.AudioCodec,ac3) + substring(VideoPlayer.AudioChannels,6)]</visible>
+ </control>
+
+ <control type="image">
+ <description>Audio Channels Image</description>
+ <width>60</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
+ </control>
</control>
<control type="label">
- <description>RW Label</description>
+ <description>Playing Label</description>
<posx>0</posx>
<posy>0</posy>
<width>500</width>
@@ -168,58 +130,52 @@
<font>font13_title</font>
<textcolor>blue</textcolor>
<shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x4</label>
- <visible>Player.Rewinding4x</visible>
+ <label>31040</label>
</control>
<control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
+ <posx>10</posx>
+ <posy>35</posy>
+ <width>880</width>
+ <height>30</height>
+ <label>$INFO[VideoPlayer.Studio]</label>
<align>left</align>
<aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x8</label>
- <visible>Player.Rewinding8x</visible>
+ <visible>VideoPlayer.Content(Movies)</visible>
</control>
<control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
+ <posx>10</posx>
+ <posy>35</posy>
+ <width>880</width>
+ <height>30</height>
+ <label>$INFO[VideoPlayer.TVShowTitle] - ($INFO[VideoPlayer.Season]$INFO[VideoPlayer.Episode,x])</label>
<align>left</align>
<aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x16</label>
- <visible>Player.Rewinding16x</visible>
+ <visible>VideoPlayer.Content(Episodes)</visible>
</control>
<control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
+ <posx>10</posx>
+ <posy>35</posy>
+ <width>880</width>
+ <height>30</height>
+ <label>$INFO[VideoPlayer.Artist]$INFO[VideoPlayer.Album, - ]</label>
<align>left</align>
<aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x32</label>
- <visible>Player.Rewinding32x</visible>
+ <visible>VideoPlayer.Content(MusicVideos)</visible>
</control>
- <!-- End Stuff to fill in for seekbar not being visible -->
-
<control type="label">
- <posx>0</posx>
- <posy>30</posy>
- <width>870</width>
- <height>25</height>
+ <posx>10</posx>
+ <posy>65</posy>
+ <width>880</width>
+ <height>30</height>
<label>$INFO[VideoPlayer.Title]</label>
<scroll>true</scroll>
<align>left</align>
@@ -228,265 +184,60 @@
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
</control>
+
<control type="label">
+ <description>Chapter Count</description>
<posx>0</posx>
- <posy>67</posy>
- <width>360</width>
+ <posy>110</posy>
+ <width>300</width>
<height>20</height>
- <label>$INFO[Player.Chapter,$LOCALIZE[21396]: ]$INFO[Player.ChapterCount, / ]</label>
+ <label>$INFO[Player.Chapter,[COLOR=blue]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount, / ]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12_title</font>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
- <visible>Player.ChapterCount + !VideoPlayer.Content(Episodes)</visible>
+ <visible>Player.ChapterCount</visible>
</control>
<control type="label">
+ <description>Chapter Name</description>
<posx>0</posx>
- <posy>67</posy>
- <width>360</width>
+ <posy>130</posy>
+ <width>300</width>
<height>20</height>
- <label>$INFO[VideoPlayer.Season,$LOCALIZE[20373]: ] &#32;&#32;&#32; $INFO[VideoPlayer.Episode,$LOCALIZE[20359]: ]</label>
+ <label>$INFO[Player.ChapterName]</label>
<align>left</align>
<aligny>center</aligny>
<font>font12_title</font>
<textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
- <visible>VideoPlayer.Content(Episodes)</visible>
</control>
<control type="label">
- <posx>870</posx>
- <posy>67</posy>
- <width>360</width>
- <height>20</height>
- <label>$LOCALIZE[31049] : $INFO[Player.FinishTime]</label>
+ <description>Player Times</description>
+ <posx>890</posx>
+ <posy>115</posy>
+ <width>500</width>
+ <height>25</height>
+ <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
<align>right</align>
<aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>grey2</textcolor>
+ <font>font30_title</font>
+ <textcolor>grey</textcolor>
<shadowcolor>black</shadowcolor>
</control>
- <control type="progress">
- <description>Progressbar</description>
- <posx>0</posx>
- <posy>87</posy>
- <width>870</width>
- <height>14</height>
- <info>Player.Progress</info>
- </control>
- <control type="label">
- <description>Elapsed Time Label</description>
- <posx>0</posx>
- <posy>100</posy>
- <width>375</width>
- <height>20</height>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[Player.Time]</label>
- <visible>!Player.Seeking</visible>
- </control>
<control type="label">
- <description>Seek Time Label</description>
- <posx>0</posx>
- <posy>100</posy>
- <width>375</width>
+ <description>Current Video End Time</description>
+ <posx>890</posx>
+ <posy>150</posy>
+ <width>890</width>
<height>20</height>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[Player.SeekTime]</label>
- <visible>Player.Seeking</visible>
- </control>
- <control type="label">
- <posx>870</posx>
- <posy>100</posy>
- <width>370</width>
- <height>25</height>
- <label>$INFO[Player.Duration]</label>
+ <label>[COLOR=blue]$LOCALIZE[31049][/COLOR] : $INFO[Player.FinishTime]</label>
<align>right</align>
<aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
+ <font>font12_title</font>
+ <textcolor>grey2</textcolor>
<shadowcolor>black</shadowcolor>
</control>
- <control type="grouplist">
- <description>Media Codec Flagging Images</description>
- <posx>320</posx>
- <posy>0</posy>
- <width>550</width>
- <align>right</align>
- <itemgap>0</itemgap>
- <orientation>horizontal</orientation>
- <control type="image">
- <description>Video rez Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
- </control>
- <control type="image">
- <description>Xvid Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/xvid.png</texture>
- <visible>substring(VideoPlayer.VideoCodec,xvid)</visible>
- </control>
- <control type="image">
- <description>Divx Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/divx.png</texture>
- <visible>substring(VideoPlayer.VideoCodec,divx) | substring(VideoPlayer.VideoCodec,div3) |substring(VideoPlayer.VideoCodec,div4) | substring(VideoPlayer.VideoCodec,div5)</visible>
- </control>
- <control type="image">
- <description>h264 Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/h264.png</texture>
- <visible>substring(VideoPlayer.VideoCodec,h264)</visible>
- </control>
- <control type="image">
- <description>avc1 Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/avc1.png</texture>
- <visible>substring(VideoPlayer.VideoCodec,avc1)</visible>
- </control>
- <control type="image">
- <description>wvc1 Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/wvc1.png</texture>
- <visible>substring(VideoPlayer.VideoCodec,wvc1)</visible>
- </control>
- <control type="image">
- <description>mpeg1video Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/mpeg1video.png</texture>
- <visible>substring(VideoPlayer.VideoCodec,mpeg1video)</visible>
- </control>
- <control type="image">
- <description>mp3 Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/mp3.png</texture>
- <visible>substring(VideoPlayer.AudioCodec,mp3)</visible>
- </control>
- <control type="image">
- <description>dts Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/dts.png</texture>
- <visible>substring(VideoPlayer.AudioCodec,dca)</visible>
- </control>
- <control type="image">
- <description>ac3 Image</description>
- <width>35</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/ac3.png</texture>
- <visible>substring(VideoPlayer.AudioCodec,ac3) + !substring(VideoPlayer.AudioChannels,6)</visible>
- </control>
- <control type="image">
- <description>aac Image</description>
- <width>35</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/aac.png</texture>
- <visible>substring(VideoPlayer.AudioCodec,aac)</visible>
- </control>
- <control type="image">
- <description>Dolby Digital Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/dolbydigital.png</texture>
- <visible>substring(VideoPlayer.AudioCodec,ac3) + substring(VideoPlayer.AudioChannels,6)</visible>
- </control>
- <control type="image">
- <description>WMA Pro Codec Image</description>
- <width>80</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/wmapro.png</texture>
- <visible>substring(VideoPlayer.AudioCodec,wmapro)</visible>
- </control>
- <control type="image">
- <description>Audio Channels Image</description>
- <width>35</width>
- <height>28</height>
- <aspectratio>keep</aspectratio>
- <texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
- </control>
- </control>
- </control>
- </control>
- <control type="group">
- <visible>VideoPlayer.Content(Movies)</visible>
- <animation effect="slide" start="0,380" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <animation effect="slide" start="0,0" end="0,380" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,0" end="0,380" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)">Conditional</animation>
- <control type="image">
- <description>cover image</description>
- <posx>10</posx>
- <posy>380r</posy>
- <width>350</width>
- <height>350</height>
- <fadetime>200</fadetime>
- <texture background="true">$INFO[VideoPlayer.cover]</texture>
- <aspectratio aligny="bottom">keep</aspectratio>
- <bordertexture border="8">ThumbShadow.png</bordertexture>
- <bordersize>8</bordersize>
- </control>
- <control type="image">
- <description>cover image</description>
- <posx>18</posx>
- <posy>38r</posy>
- <width>334</width>
- <height>334</height>
- <fadetime>200</fadetime>
- <texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$INFO[VideoPlayer.cover]</texture>
- <aspectratio aligny="top">keep</aspectratio>
- </control>
- </control>
- <control type="group">
- <visible>!VideoPlayer.Content(Movies)</visible>
- <animation effect="slide" start="0,260" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <animation effect="slide" start="0,0" end="0,260" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,0" end="0,260" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)">Conditional</animation>
- <control type="image">
- <description>cover image</description>
- <posx>10</posx>
- <posy>260r</posy>
- <width>350</width>
- <height>230</height>
- <fadetime>200</fadetime>
- <texture background="true">$INFO[VideoPlayer.cover]</texture>
- <aspectratio aligny="bottom">keep</aspectratio>
- <bordertexture border="8">ThumbShadow.png</bordertexture>
- <bordersize>8</bordersize>
- </control>
- <control type="image">
- <description>cover image</description>
- <posx>18</posx>
- <posy>38r</posy>
- <width>334</width>
- <height>214</height>
- <fadetime>200</fadetime>
- <texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$INFO[VideoPlayer.cover]</texture>
- <aspectratio aligny="top">keep</aspectratio>
</control>
</control>
<include>Clock</include>
diff --git a/skin/Confluence/720p/DialogSeekBar.xml b/skin/Confluence/720p/DialogSeekBar.xml
index e0269359fa..798411a577 100644
--- a/skin/Confluence/720p/DialogSeekBar.xml
+++ b/skin/Confluence/720p/DialogSeekBar.xml
@@ -10,14 +10,12 @@
</coordinates>
<controls>
<control type="group">
- <animation effect="slide" end="0,80" start="0,0" time="100" condition="Window.IsVisible(FullscreenInfo) | [Window.IsVisible(Visualisation) + Player.ShowInfo]">Conditional</animation>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>370</width>
<height>80</height>
<texture border="20,20,20,2">InfoMessagePanel.png</texture>
- <colordiffuse>EEFFFFFF</colordiffuse>
<visible>!player.chaptercount</visible>
</control>
<control type="image">
@@ -26,7 +24,6 @@
<width>450</width>
<height>80</height>
<texture border="20,20,20,2">InfoMessagePanel.png</texture>
- <colordiffuse>EEFFFFFF</colordiffuse>
<visible>player.chaptercount</visible>
</control>
<control type="group">
diff --git a/skin/Confluence/720p/IncludesCodecFlagging.xml b/skin/Confluence/720p/IncludesCodecFlagging.xml
index 5188f56037..392cc79584 100644
--- a/skin/Confluence/720p/IncludesCodecFlagging.xml
+++ b/skin/Confluence/720p/IncludesCodecFlagging.xml
@@ -8,12 +8,13 @@
<texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
</control>
<control type="image">
- <description>Xvid Codec Image</description>
+ <description>Common Codec Image</description>
<width>90</width>
<height>33</height>
<aspectratio>keep</aspectratio>
- <texture>flagging/video/xvid.png</texture>
- <visible>substring(ListItem.VideoCodec,xvid)</visible>
+ <texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
+ <!-- Don't show if its one of the 500 divx codecs -->
+ <visible>![substring(ListItem.VideoCodec,divx) | substring(ListItem.VideoCodec,div3) |substring(ListItem.VideoCodec,div4) | substring(ListItem.VideoCodec,div5)]</visible>
</control>
<control type="image">
<description>Divx Codec Image</description>
@@ -23,46 +24,6 @@
<texture>flagging/video/divx.png</texture>
<visible>substring(ListItem.VideoCodec,divx) | substring(ListItem.VideoCodec,div3) |substring(ListItem.VideoCodec,div4) | substring(ListItem.VideoCodec,div5)</visible>
</control>
- <control type="image">
- <description>h264 Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/h264.png</texture>
- <visible>substring(ListItem.VideoCodec,h264)</visible>
- </control>
- <control type="image">
- <description>avc1 Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/avc1.png</texture>
- <visible>substring(ListItem.VideoCodec,avc1)</visible>
- </control>
- <control type="image">
- <description>wvc1 Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/wvc1.png</texture>
- <visible>substring(ListItem.VideoCodec,wvc1)</visible>
- </control>
- <control type="image">
- <description>mpeg1video Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/mpeg1video.png</texture>
- <visible>substring(ListItem.VideoCodec,mpeg1video)</visible>
- </control>
- <control type="image">
- <description>mpeg2video Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/video/mpeg2video.png</texture>
- <visible>substring(ListItem.VideoCodec,mpeg2video)</visible>
- </control>
</include>
<include name="VideoTypeHackFlaggingConditions">
<control type="image">
@@ -126,59 +87,21 @@
</include>
<include name="AudioCodecFlaggingConditions">
<control type="image">
- <description>mp3 Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/mp3.png</texture>
- <visible>substring(ListItem.AudioCodec,mp3)</visible>
- </control>
- <control type="image">
- <description>dts Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/dts.png</texture>
- <visible>substring(ListItem.AudioCodec,dca)</visible>
- </control>
- <control type="image">
- <description>ac3 Image</description>
- <width>45</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/ac3.png</texture>
- <visible>substring(ListItem.AudioCodec,ac3) + !substring(ListItem.AudioChannels,6)</visible>
- </control>
- <control type="image">
- <description>aac Image</description>
- <width>45</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>flagging/audio/aac.png</texture>
- <visible>substring(ListItem.AudioCodec,aac)</visible>
- </control>
- <control type="image">
<description>Dolby Digital Image</description>
<width>90</width>
<height>33</height>
<aspectratio>keep</aspectratio>
<texture>flagging/audio/dolbydigital.png</texture>
- <visible>substring(ListItem.AudioCodec,ac3) + substring(ListItem.AudioChannels,6)</visible>
+ <visible>[substring(ListItem.AudioCodec,ac3) + substring(ListItem.AudioChannels,6)]</visible>
</control>
<control type="image">
- <description>WMA Pro Codec Image</description>
+ <description>Audio Codec Image</description>
<width>90</width>
<height>33</height>
<aspectratio>keep</aspectratio>
- <texture>flagging/audio/wmapro.png</texture>
- <visible>substring(ListItem.AudioCodec,wmapro)</visible>
- </control>
- <control type="image">
- <description>Audio Channels Image</description>
- <width>45</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
- <texture>$INFO[ListItem.AudioChannels,flagging/audio/,.png]</texture>
+ <texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
+ <!-- Don't show if I want the Dolby Digital Logo -->
+ <visible>![substring(ListItem.AudioCodec,ac3) + substring(ListItem.AudioChannels,6)]</visible>
</control>
</include>
<include name="AspectCodecFlaggingConditions">
diff --git a/skin/Confluence/720p/MusicVisualisation.xml b/skin/Confluence/720p/MusicVisualisation.xml
index 46d2ca4dcf..39eeae3da7 100644
--- a/skin/Confluence/720p/MusicVisualisation.xml
+++ b/skin/Confluence/720p/MusicVisualisation.xml
@@ -8,346 +8,168 @@
<posy>0</posy>
<width>1280</width>
<height>720</height>
+<!-- <visible>IsEmpty(MusicPlayer.Property(Fanart_Image)</visible>
</control>
+ <control type="image">
+ <description>Fanart image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>1280</width>
+ <height>720</height>
+ <texture>$INFO[MusicPlayer.Property(Fanart_Image)]</texture>
+ <visible>!IsEmpty(MusicPlayer.Property(Fanart_Image))</visible>
+--> </control>
<control type="group">
<visible>Player.ShowInfo + ![Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
- <animation effect="slide" start="0,160" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <animation effect="slide" start="0,0" end="0,160" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,160" end="0,0" time="300" tween="quadratic" easing="out">visible</animation>
- <animation effect="slide" start="0,0" end="0,160" time="300" delay="150" tween="quadratic" easing="out">hidden</animation>
+ <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
+ <animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">visible</animation>
+ <animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">hidden</animation>
<control type="image">
<description>media info background image</description>
<posx>0</posx>
- <posy>160r</posy>
+ <posy>270r</posy>
<width>1280</width>
- <height>256</height>
- <texture>MediaInfoBackLower.png</texture>
+ <height>270</height>
+ <texture>HomeNowPlayingBack.png</texture>
</control>
- <control type="group">
- <control type="group">
- <posx>330</posx>
- <posy>135r</posy>
- <!-- Stuff to fill in for seekbar not being visible -->
- <control type="label">
- <description>Paused Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>31043</label>
- <visible>[Player.Paused + !Player.Caching] + !Player.Seeking</visible>
- </control>
- <control type="label">
- <description>Cache Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
- <visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
- </control>
- <control type="label">
- <description>Seeking Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</label>
- <visible>Player.Seeking</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x2</label>
- <visible>Player.Forwarding2x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x4</label>
- <visible>Player.Forwarding4x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x8</label>
- <visible>Player.Forwarding8x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x16</label>
- <visible>Player.Forwarding16x</visible>
- </control>
- <control type="label">
- <description>FF Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31044] x32</label>
- <visible>Player.Forwarding32x</visible>
- </control>
- <control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x2</label>
- <visible>Player.Rewinding2x</visible>
- </control>
- <control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x4</label>
- <visible>Player.Rewinding4x</visible>
- </control>
- <control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x8</label>
- <visible>Player.Rewinding8x</visible>
- </control>
- <control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x16</label>
- <visible>Player.Rewinding16x</visible>
- </control>
- <control type="label">
- <description>RW Label</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>500</width>
- <height>25</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <label>$LOCALIZE[31045] x32</label>
- <visible>Player.Rewinding32x</visible>
- </control>
- <!-- End Stuff to fill in for seekbar not being visible -->
- <control type="label">
- <posx>0</posx>
- <posy>0</posy>
- <width>750</width>
- <height>25</height>
- <label>$INFO[MusicPlayer.Artist]$INFO[MusicPlayer.Album, - ]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13</font>
- <textcolor>grey</textcolor>
- <shadowcolor>black</shadowcolor>
- <visible>Player.Playing + !Player.Seeking</visible>
- </control>
- <control type="image">
- <description>Rating image</description>
- <posx>760</posx>
- <posy>0</posy>
- <width>160</width>
- <height>30</height>
- <aspectratio align="right">keep</aspectratio>
- <texture>LeftRating/$INFO[Player.StarRating]</texture>
- </control>
- <control type="label">
- <posx>0</posx>
- <posy>30</posy>
- <width>920</width>
- <height>25</height>
- <label>$INFO[MusicPlayer.Title]</label>
- <scroll>true</scroll>
- <align>left</align>
- <aligny>center</aligny>
- <font>font24_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <posx>0</posx>
- <posy>67</posy>
- <width>200</width>
- <height>20</height>
- <label>$INFO[musicplayer.Playlistposition,$LOCALIZE[554]: ]$INFO[musicplayer.Playlistlength, / ]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>grey2</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <posx>920</posx>
- <posy>67</posy>
- <width>700</width>
- <height>20</height>
- <label>[COLOR=blue]$LOCALIZE[209] :[/COLOR] $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>grey2</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="progress">
- <description>Progressbar</description>
- <posx>0</posx>
- <posy>87</posy>
- <width>920</width>
- <height>14</height>
- <info>Player.Progress</info>
- </control>
- <control type="label">
- <description>Elapsed Time Label</description>
- <posx>0</posx>
- <posy>100</posy>
- <width>375</width>
- <height>20</height>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[Player.Time]</label>
- <visible>!Player.Seeking</visible>
- </control>
- <control type="label">
- <description>Seek Time Label</description>
- <posx>0</posx>
- <posy>100</posy>
- <width>375</width>
- <height>20</height>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <align>left</align>
- <aligny>center</aligny>
- <label>$INFO[Player.SeekTime]</label>
- <visible>Player.Seeking</visible>
- </control>
- <control type="label">
- <posx>920</posx>
- <posy>100</posy>
- <width>370</width>
- <height>25</height>
- <label>$INFO[Player.Duration]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
+ <control type="image">
+ <description>media info background image</description>
+ <posx>0</posx>
+ <posy>270r</posy>
+ <width>1280</width>
+ <height>270</height>
+ <colordiffuse>88FFFFFF</colordiffuse>
+ <texture>HomeNowPlayingBack.png</texture>
</control>
- </control>
- <control type="group">
- <visible>Player.ShowInfo</visible>
- <animation effect="slide" start="0,260" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <animation effect="slide" start="0,0" end="0,260" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,260" end="0,0" time="300" tween="quadratic" easing="out">visible</animation>
- <animation effect="slide" start="0,0" end="0,260" time="300" delay="150" tween="quadratic" easing="out">hidden</animation>
- <visible>Player.ShowInfo + ![Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
<control type="image">
<description>cover image</description>
<posx>10</posx>
- <posy>260r</posy>
- <width>300</width>
- <height>230</height>
+ <posy>290r</posy>
+ <width>340</width>
+ <height>260</height>
<fadetime>200</fadetime>
<texture background="true">$INFO[MusicPlayer.cover]</texture>
<aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
</control>
- <control type="image">
- <description>cover image</description>
- <posx>18</posx>
- <posy>38r</posy>
- <width>284</width>
- <height>214</height>
- <fadetime>200</fadetime>
- <texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$INFO[MusicPlayer.cover]</texture>
- <aspectratio aligny="top">keep</aspectratio>
+ <control type="progress">
+ <description>Progressbar</description>
+ <posx>10</posx>
+ <posy>30r</posy>
+ <width>340</width>
+ <height>14</height>
+ <info>Player.Progress</info>
+ </control>
+ <control type="group">
+ <posx>370</posx>
+ <posy>180r</posy>
+ <control type="grouplist">
+ <description>Media Codec Flagging Images</description>
+ <posx>340</posx>
+ <posy>0</posy>
+ <width>550</width>
+ <align>right</align>
+ <itemgap>0</itemgap>
+ <orientation>horizontal</orientation>
+ <control type="image">
+ <description>Rating image</description>
+ <width>120</width>
+ <height>40</height>
+ <aspectratio align="right">keep</aspectratio>
+ <texture>LeftRating/$INFO[Player.StarRating]</texture>
+ </control>
+ <control type="image">
+ <description>Codec Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
+ </control>
+ <control type="image">
+ <description>Channels Image</description>
+ <width>80</width>
+ <height>40</height>
+ <aspectratio>keep</aspectratio>
+ <texture>$INFO[MusicPlayer.Channels,flagging/audio/,.png]</texture>
+ </control>
+ </control>
+ <control type="label">
+ <description>Playing Label</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>500</width>
+ <height>25</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13_title</font>
+ <textcolor>blue</textcolor>
+ <shadowcolor>black</shadowcolor>
+ <label>31040</label>
+ </control>
+ <control type="label">
+ <posx>10</posx>
+ <posy>35</posy>
+ <width>880</width>
+ <height>30</height>
+ <label>$INFO[MusicPlayer.Artist]$INFO[MusicPlayer.Album, - ]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>grey</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <posx>10</posx>
+ <posy>65</posy>
+ <width>880</width>
+ <height>30</height>
+ <label>$INFO[MusicPlayer.Title]</label>
+ <scroll>true</scroll>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font24_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>300</width>
+ <height>20</height>
+ <label>$INFO[musicplayer.Playlistposition,[COLOR=blue]$LOCALIZE[554]:[/COLOR] ]$INFO[musicplayer.Playlistlength, / ]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>grey2</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <posx>890</posx>
+ <posy>115</posy>
+ <width>370</width>
+ <height>25</height>
+ <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font35_title</font>
+ <textcolor>grey</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <posx>890</posx>
+ <posy>150</posy>
+ <width>890</width>
+ <height>20</height>
+ <label>[COLOR=blue]$LOCALIZE[209] :[/COLOR] $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>grey2</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
</control>
</control>
<control type="group">
diff --git a/skin/Confluence/media/flagging/audio/aif.png b/skin/Confluence/media/flagging/audio/aif.png
new file mode 100644
index 0000000000..f3ad548528
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/aif.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/aifc.png b/skin/Confluence/media/flagging/audio/aifc.png
new file mode 100644
index 0000000000..950c6928f1
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/aifc.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/aiff.png b/skin/Confluence/media/flagging/audio/aiff.png
new file mode 100644
index 0000000000..9295b77c35
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/aiff.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/ape.png b/skin/Confluence/media/flagging/audio/ape.png
new file mode 100644
index 0000000000..65577a0b4c
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/ape.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/avc.png b/skin/Confluence/media/flagging/audio/avc.png
new file mode 100644
index 0000000000..ad35656964
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/avc.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/cdda.png b/skin/Confluence/media/flagging/audio/cdda.png
new file mode 100644
index 0000000000..b5431aa8f6
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/cdda.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/dca.png b/skin/Confluence/media/flagging/audio/dca.png
new file mode 100644
index 0000000000..3acdfaadd9
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/dca.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/flac.png b/skin/Confluence/media/flagging/audio/flac.png
new file mode 100644
index 0000000000..b5a5d1b675
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/flac.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/mp1.png b/skin/Confluence/media/flagging/audio/mp1.png
new file mode 100644
index 0000000000..c52e6f0299
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/mp1.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/mp2.png b/skin/Confluence/media/flagging/audio/mp2.png
new file mode 100644
index 0000000000..a121b00247
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/mp2.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/ogg.png b/skin/Confluence/media/flagging/audio/ogg.png
new file mode 100644
index 0000000000..6f5c94ef0d
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/ogg.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/truehd.png b/skin/Confluence/media/flagging/audio/truehd.png
new file mode 100644
index 0000000000..1de0b19a9c
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/truehd.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/wma.png b/skin/Confluence/media/flagging/audio/wma.png
new file mode 100644
index 0000000000..d4047fdb2d
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/wma.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/audio/wmav2.png b/skin/Confluence/media/flagging/audio/wmav2.png
new file mode 100644
index 0000000000..b5adff2326
--- /dev/null
+++ b/skin/Confluence/media/flagging/audio/wmav2.png
Binary files differ
diff --git a/skin/Confluence/media/flagging/video/flv.png b/skin/Confluence/media/flagging/video/flv.png
new file mode 100644
index 0000000000..20aeb6bab4
--- /dev/null
+++ b/skin/Confluence/media/flagging/video/flv.png
Binary files differ
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-05 17:07:53 +0000