From 30fe6784664dca24d9cde3cda9ecb2cd6acedd17 Mon Sep 17 00:00:00 2001
From: Kevin Goffe <HitcherUK@gmail.com>
Date: Sun, 18 Nov 2018 11:06:38 +0000
Subject: [PATCH] [skin.confluence] v4.5.4

Fix missing video and audio codec flags
---
 720p/Includes.xml              |   5 +++++
 720p/IncludesCodecFlagging.xml |   2 +-
 addon.xml                      |   2 +-
 media/flagging/video/mpeg4.png | Bin 0 -> 3753 bytes
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 media/flagging/video/mpeg4.png

diff --git a/720p/Includes.xml b/720p/Includes.xml
index d2c2453..3a0ff58 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -498,8 +498,13 @@
 		<value condition="String.Contains(Listitem.mpaa,Rated NR)">mpaa_notrated</value>
 		<value condition="String.Contains(Listitem.mpaa,Not Rated)">mpaa_notrated</value>
 	</variable>
+	<variable name="audiocodec">
+		<value condition="String.StartsWith(ListItem.AudioCodec,mp3)">mp3</value>
+		<value>$INFO[ListItem.AudioCodec]</value>
+	</variable>
 	<variable name="videocodec">
 		<value condition="[String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]">divx</value>
+		<value condition="String.Contains(ListItem.VideoCodec,mpeg4)">mpeg4</value>
 		<value>$INFO[ListItem.VideoCodec]</value>
 	</variable>
 	<variable name="SeekLabel">
diff --git a/720p/IncludesCodecFlagging.xml b/720p/IncludesCodecFlagging.xml
index ff1921f..c4e706c 100644
--- a/720p/IncludesCodecFlagging.xml
+++ b/720p/IncludesCodecFlagging.xml
@@ -51,7 +51,7 @@
 			<width>80</width>
 			<height>35</height>
 			<aspectratio align="right">keep</aspectratio>
-			<texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
+			<texture>$VAR[audiocodec,flagging/audio/,.png]</texture>
 		</control>
 	</include>
 	<include name="AudioChannelsFlaggingConditions">
diff --git a/addon.xml b/addon.xml
index ffd6909..260d081 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.5.3" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.5.4" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>
diff --git a/media/flagging/video/mpeg4.png b/media/flagging/video/mpeg4.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c4c738ae9d2dbf83a9f4f165f15f15329b719ed
GIT binary patch
literal 3753
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
T5@nvK00000NkvXXu0mjf-a1Qi

literal 0
HcmV?d00001