Updated : [PM3.HD] Codec Flagging images to on a par with Confluence

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29772 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

23 files changed, 19 insertions, 75 deletions

diff --git a/addons/skin.pm3-hd/720p/IncludesCodecFlagging.xml b/addons/skin.pm3-hd/720p/IncludesCodecFlagging.xml
index 95719dba46..9b8716e85a 100644
--- a/addons/skin.pm3-hd/720p/IncludesCodecFlagging.xml
+++ b/addons/skin.pm3-hd/720p/IncludesCodecFlagging.xml
@@ -1,5 +1,5 @@
 <includes>

-	<include name="CodecFlaggingConditions">

+	<include name="VideoCodecFlagging">

 		<control type="image">

 			<description>Video rez Image</description>

 			<width>90</width>

@@ -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>![stringcompare(ListItem.VideoCodec,divx) | stringcompare(ListItem.VideoCodec,div3) |stringcompare(ListItem.VideoCodec,div4) | stringcompare(ListItem.VideoCodec,div5)]</visible>

 		</control>

 		<control type="image">

 			<description>Divx Codec Image</description>

@@ -21,87 +22,26 @@
 			<height>33</height>

 			<aspectratio>keep</aspectratio>

 			<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>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>90</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>90</width>

-			<height>33</height>

-			<aspectratio>keep</aspectratio>

-			<texture>flagging/audio/aac.png</texture>

-			<visible>substring(ListItem.AudioCodec,aac)</visible>

+			<visible>stringcompare(ListItem.VideoCodec,divx) | stringcompare(ListItem.VideoCodec,div3) |stringcompare(ListItem.VideoCodec,div4) | stringcompare(ListItem.VideoCodec,div5)</visible>

 		</control>

+	</include>

+	<include name="AudioCodecFlagging">

 		<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>[stringcompare(ListItem.AudioCodec,ac3) + stringcompare(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>

+			<texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>

+			<!-- Don't show if I want the Dolby Digital Logo -->

+			<visible>![stringcompare(ListItem.AudioCodec,ac3) + stringcompare(ListItem.AudioChannels,6)]</visible>

 		</control>

 		<control type="image">

 			<description>Audio Channels Image</description>

@@ -110,9 +50,11 @@
 			<aspectratio>keep</aspectratio>

 			<texture>$INFO[ListItem.AudioChannels,flagging/audio/,.png]</texture>

 		</control>

+	</include>

+	<include name="AspectCodecFlagging">

 		<control type="image">

 			<description>Aspectratio Image</description>

-			<width>90</width>

+			<width>60</width>

 			<height>33</height>

 			<aspectratio>keep</aspectratio>

 			<texture>$INFO[ListItem.VideoAspect,flagging/aspectratio/,.png]</texture>

diff --git a/addons/skin.pm3-hd/720p/MyVideoNav.xml b/addons/skin.pm3-hd/720p/MyVideoNav.xml
index 166ca96cfc..19be755ac7 100644
--- a/addons/skin.pm3-hd/720p/MyVideoNav.xml
+++ b/addons/skin.pm3-hd/720p/MyVideoNav.xml
@@ -53,7 +53,9 @@
 				<width>640</width>

 				<itemgap>0</itemgap>

 				<orientation>horizontal</orientation>

-				<include>CodecFlaggingConditions</include>

+				<include>VideoCodecFlagging</include>

+				<include>AudioCodecFlagging</include>

+				<include>AspectCodecFlagging</include>

 				<animation effect="slide" start="0,0" end="-280,0" time="300" tween="quadratic" easing="out" condition="Control.IsVisible(500)">Conditional</animation>

 				<visible>!Control.IsVisible(56) + !Control.IsVisible(55) + !Skin.HasSetting(Hide_Video_Flags)</visible>

 			</control>

diff --git a/addons/skin.pm3-hd/media/flagging/audio/ac3.png b/addons/skin.pm3-hd/media/flagging/audio/ac3.png
index e99d320b12..ccffb8a400 100644
--- a/addons/skin.pm3-hd/media/flagging/audio/ac3.png
+++ b/addons/skin.pm3-hd/media/flagging/audio/ac3.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/aif.png b/addons/skin.pm3-hd/media/flagging/audio/aif.png
new file mode 100644
index 0000000000..f3ad548528
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/aif.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/aifc.png b/addons/skin.pm3-hd/media/flagging/audio/aifc.png
new file mode 100644
index 0000000000..950c6928f1
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/aifc.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/aiff.png b/addons/skin.pm3-hd/media/flagging/audio/aiff.png
new file mode 100644
index 0000000000..9295b77c35
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/aiff.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/ape.png b/addons/skin.pm3-hd/media/flagging/audio/ape.png
new file mode 100644
index 0000000000..65577a0b4c
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/ape.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/avc.png b/addons/skin.pm3-hd/media/flagging/audio/avc.png
new file mode 100644
index 0000000000..ad35656964
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/avc.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/cdda.png b/addons/skin.pm3-hd/media/flagging/audio/cdda.png
new file mode 100644
index 0000000000..b5431aa8f6
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/cdda.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/dca.png b/addons/skin.pm3-hd/media/flagging/audio/dca.png
new file mode 100644
index 0000000000..3acdfaadd9
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/dca.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/eac3.png b/addons/skin.pm3-hd/media/flagging/audio/eac3.png
new file mode 100644
index 0000000000..02e7780bf0
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/eac3.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/flac.png b/addons/skin.pm3-hd/media/flagging/audio/flac.png
new file mode 100644
index 0000000000..b5a5d1b675
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/flac.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/mp1.png b/addons/skin.pm3-hd/media/flagging/audio/mp1.png
new file mode 100644
index 0000000000..c52e6f0299
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/mp1.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/mp2.png b/addons/skin.pm3-hd/media/flagging/audio/mp2.png
new file mode 100644
index 0000000000..a121b00247
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/mp2.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/ogg.png b/addons/skin.pm3-hd/media/flagging/audio/ogg.png
new file mode 100644
index 0000000000..6f5c94ef0d
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/ogg.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/truehd.png b/addons/skin.pm3-hd/media/flagging/audio/truehd.png
new file mode 100644
index 0000000000..1de0b19a9c
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/truehd.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/wma.png b/addons/skin.pm3-hd/media/flagging/audio/wma.png
new file mode 100644
index 0000000000..d4047fdb2d
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/wma.png
diff --git a/addons/skin.pm3-hd/media/flagging/audio/wmav2.png b/addons/skin.pm3-hd/media/flagging/audio/wmav2.png
new file mode 100644
index 0000000000..b5adff2326
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/audio/wmav2.png
diff --git a/addons/skin.pm3-hd/media/flagging/video/bluray.png b/addons/skin.pm3-hd/media/flagging/video/bluray.png
new file mode 100644
index 0000000000..3c51a6a0ba
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/video/bluray.png
diff --git a/addons/skin.pm3-hd/media/flagging/video/flv.png b/addons/skin.pm3-hd/media/flagging/video/flv.png
new file mode 100644
index 0000000000..20aeb6bab4
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/video/flv.png
diff --git a/addons/skin.pm3-hd/media/flagging/video/hddvd.png b/addons/skin.pm3-hd/media/flagging/video/hddvd.png
new file mode 100644
index 0000000000..cea3a3a44b
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/video/hddvd.png
diff --git a/addons/skin.pm3-hd/media/flagging/video/mpeg2video.png b/addons/skin.pm3-hd/media/flagging/video/mpeg2video.png
new file mode 100644
index 0000000000..a06259595b
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/video/mpeg2video.png
diff --git a/addons/skin.pm3-hd/media/flagging/video/vc-1.png b/addons/skin.pm3-hd/media/flagging/video/vc-1.png
new file mode 100644
index 0000000000..319dfc2f49
--- /dev/null
+++ b/addons/skin.pm3-hd/media/flagging/video/vc-1.png