Ticket #16: mediainfo logos on osd

ncoH · May 10, 2011 · 4dc5c59 · 4dc5c59
1 parent 53bc52c
commit 4dc5c59
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 51 deletions.
diff --git a/skin/Avalon/Media/Logos/audio/AC-3 5.1.png b/skin/Avalon/Media/Logos/audio/AC-3 5.1.png
diff --git a/skin/Avalon/Media/Logos/audio/AC-3 Stereo.png b/skin/Avalon/Media/Logos/audio/AC-3 Stereo.png
diff --git a/skin/Avalon/Media/Logos/audio/DTS 5.1.png b/skin/Avalon/Media/Logos/audio/DTS 5.1.png
diff --git a/skin/Avalon/Media/Logos/audio/DTS 7.1.png b/skin/Avalon/Media/Logos/audio/DTS 7.1.png
diff --git a/skin/Avalon/Media/Logos/audio/MPEG AUDIO VERSION 1 LAYER 3 5.1.png b/skin/Avalon/Media/Logos/audio/MPEG AUDIO VERSION 1 LAYER 3 5.1.png
diff --git a/skin/Avalon/Media/Logos/audio/MPEG AUDIO VERSION 1 LAYER 3 Stereo.png b/skin/Avalon/Media/Logos/audio/MPEG AUDIO VERSION 1 LAYER 3 Stereo.png
diff --git a/skin/Avalon/videoOSD.mediainfo.xml b/skin/Avalon/videoOSD.mediainfo.xml
@@ -75,65 +75,17 @@
 		<visible>string.contains(#Play.Current.VideoResolution,SD)+string.contains(#Play.Current.VideoCodec.Texture,DIVX)+string.contains(#Play.Current.AspectRatio,fullscreen)]</visible>
 	</control>
 
-	<!-- Audiocodec -->
-	<control>
-		<description>AC3 / 5.1</description>
-		<type>image</type>
-		<id>0</id>
-		<posX>669</posX>
-		<posY>969</posY>
-		<height>38</height>
-		<keepaspectratio>yes</keepaspectratio>
-		<texture>Logos\audio\ac3_51.png</texture>
-		<visible>[string.contains(#Play.Current.AudioCodec.Texture,AC-3)+string.contains(#Play.Current.AudioChannels.Texture,5.1)]</visible>
-	</control>
-
-	<control>
-		<description>DTS / 5.1</description>
-		<type>image</type>
-		<id>0</id>
-		<posX>669</posX>
-		<posY>969</posY>
-		<height>38</height>
-		<keepaspectratio>yes</keepaspectratio>
-		<texture>Logos\audio\dts_51.png</texture>
-		<visible>string.contains(#Play.Current.AudioCodec.Texture,dts)+string.contains(#Play.Current.AudioChannels.Texture,5.1)</visible>
-	</control>
-
-	<control>
-		<description>DTS / 7.1</description>
-		<type>image</type>
-		<id>0</id>
-		<posX>669</posX>
-		<posY>969</posY>
-		<height>38</height>
-		<keepaspectratio>yes</keepaspectratio>
-		<texture>Logos\audio\dts_71.png</texture>
-		<visible>string.contains(#Play.Current.AudioCodec.Texture,dts)+[string.contains(#Play.Current.AudioChannels.Texture,7)|string.contains(#Play.Current.AudioChannels.Texture,7.1)]</visible>
-	</control>
-
-	<control>
-		<description>AC3 / 2.0</description>
-		<type>image</type>
-		<id>0</id>
-		<posX>669</posX>
-		<posY>969</posY>
-		<height>38</height>
-		<keepaspectratio>yes</keepaspectratio>
-		<texture>Logos\audio\ac3_20.png</texture>
-		<visible>string.contains(#Play.Current.AudioCodec.Texture,ac-3)+string.contains(#Play.Current.AudioChannels.Texture,stereo.png)</visible>
-	</control>
+	<!-- Audio -->
 
 	<control>
-		<description>mp3 / 2.0</description>
+		<description>Audiocodec/channels</description>
 		<type>image</type>
 		<id>0</id>
 		<posX>669</posX>
 		<posY>969</posY>
 		<height>38</height>
 		<keepaspectratio>yes</keepaspectratio>
-		<texture>Logos\audio\mp3_20.png</texture>
-		<visible>[string.contains(#Play.Current.AudioCodec.Texture, LAYER 3)+string.contains(#Play.Current.AudioChannels.Texture,stereo)]</visible>
+		<texture>Logos\audio\#Play.Current.AudioCodec.Texture #Play.Current.AudioChannels.png</texture>
 	</control>
 
 	<!-- Source -->