From 08d9016d4efe828395325b15eed07b4c6dab546f Mon Sep 17 00:00:00 2001
From: Kevin Goffe <HitcherUK@gmail.com>
Date: Sat, 2 Dec 2017 19:16:56 +0000
Subject: [PATCH] [skin.confluence] v4.1.5

Updated PVR code
---
 720p/Home.xml            |  2 +-
 720p/Includes.xml        |  6 +++---
 720p/MusicOSD.xml        |  6 +++---
 720p/PlayerControls.xml  | 12 ++++++------
 720p/VideoFullScreen.xml |  6 +++---
 720p/VideoOSD.xml        |  8 ++++----
 addon.xml                |  4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/720p/Home.xml b/720p/Home.xml
index a0e3516..81b4e29 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -739,7 +739,7 @@
 						<onright>607</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
-						<onclick>PlayerControl(record)</onclick>
+						<onclick>PVR.ToggleRecordPlayingChannel</onclick>
 					</control>
 				</control>
 			</control>
diff --git a/720p/Includes.xml b/720p/Includes.xml
index ce8e6d6..c8f26cd 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -1273,9 +1273,9 @@
 					<label/>
 					<texturefocus>OSDRecordOffFO.png</texturefocus>
 					<texturenofocus>OSDRecordOffNF.png</texturenofocus>
-					<onclick>PlayerControl(record)</onclick>
-					<enable>Player.CanRecord</enable>
-					<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation>
+					<onclick>PVR.ToggleRecordPlayingChannel</onclick>
+					<enable>PVR.CanRecordPlayingChannel</enable>
+					<animation effect="fade" start="100" end="30" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
 				</control>
 				<control type="button" id="606">
 					<width>39</width>
diff --git a/720p/MusicOSD.xml b/720p/MusicOSD.xml
index 7cac5e9..8a39836 100644
--- a/720p/MusicOSD.xml
+++ b/720p/MusicOSD.xml
@@ -267,7 +267,7 @@
 			<control type="image" id="2600">
 				<width>55</width>
 				<texture></texture>
-				<visible>!Player.CanRecord</visible>
+				<visible>!PVR.CanRecordPlayingChannel</visible>
 			</control>
 			<control type="button" id="705">
 				<width>55</width>
@@ -340,8 +340,8 @@
 				<font></font>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
-				<onclick>PlayerControl(record)</onclick>
-				<visible>Player.CanRecord</visible>
+				<onclick>PVR.ToggleRecordPlayingChannel</onclick>
+				<visible>PVR.CanRecordPlayingChannel</visible>
 			</control>
 		</control>
 	</controls>
diff --git a/720p/PlayerControls.xml b/720p/PlayerControls.xml
index c8d2d25..9066553 100644
--- a/720p/PlayerControls.xml
+++ b/720p/PlayerControls.xml
@@ -126,9 +126,9 @@
 				<onright>607</onright>
 				<onup>300</onup>
 				<ondown>200</ondown>
-				<onclick>PlayerControl(record)</onclick>
-				<enable>Player.CanRecord</enable>
-				<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation>
+				<onclick>PVR.ToggleRecordPlayingChannel</onclick>
+				<enable>PVR.CanRecordPlayingChannel</enable>
+				<animation effect="fade" start="100" end="30" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
 				<visible>!VideoPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="group">
@@ -371,9 +371,9 @@
 				<onright>707</onright>
 				<onup>300</onup>
 				<ondown>200</ondown>
-				<onclick>PlayerControl(record)</onclick>
-				<enable>Player.CanRecord</enable>
-				<animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation>
+				<onclick>PVR.ToggleRecordPlayingChannel</onclick>
+				<enable>PVR.CanRecordPlayingChannel</enable>
+				<animation effect="fade" start="100" end="30" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
 				<visible>VideoPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="button" id="707">
diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
index ec2e5d3..0d84a4d 100644
--- a/720p/VideoFullScreen.xml
+++ b/720p/VideoFullScreen.xml
@@ -164,7 +164,7 @@
 					<label>$LOCALIZE[31040]</label>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<visible>![VideoPlayer.Content(LiveTV) + Player.Recording]</visible>
+					<visible>![VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel]</visible>
 					<animation effect="slide" start="0,0" end="0,25" time="0" condition="!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes) + !VideoPlayer.Content(MusicVideos) + !VideoPlayer.Content(LiveTV) + !PVR.IsPlayingRecording">conditional</animation>
 				</control>
 				<control type="image" id="1">
@@ -173,7 +173,7 @@
 					<height>25</height>
 					<aspectratio align="center" aligny="center">keep</aspectratio>
 					<texture>PVR-IsRecording.png</texture>
-					<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive</visible>
+					<visible>VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible>
 				</control>
 				<control type="label" id="1">
 					<description>Heading label</description>
@@ -187,7 +187,7 @@
 					<label>$LOCALIZE[19158]</label>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive</visible>
+					<visible>VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible>
 				</control>
 				<control type="label" id="1">
 					<description>Studio label</description>
diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml
index 8f5404c..7a70425 100644
--- a/720p/VideoOSD.xml
+++ b/720p/VideoOSD.xml
@@ -256,12 +256,12 @@
 				<font></font>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
-				<usealttexture>Player.Recording</usealttexture>
+				<usealttexture>PVR.IsRecordingPlayingChannel</usealttexture>
 				<alttexturefocus>OSDRecordOnFO.png</alttexturefocus>
 				<alttexturenofocus>OSDRecordOnNF.png</alttexturenofocus>
-				<onclick>PlayerControl(Record)</onclick>
-				<enable>Player.CanRecord</enable>
-				<animation effect="fade" start="100" end="50" time="75" condition="!Player.CanRecord">Conditional</animation>
+				<onclick>PVR.ToggleRecordPlayingChannel</onclick>
+				<enable>PVR.CanRecordPlayingChannel</enable>
+				<animation effect="fade" start="100" end="50" time="75" condition="!PVR.CanRecordPlayingChannel">Conditional</animation>
 				<visible>VideoPlayer.Content(LiveTV)</visible>
 			</control>
 		</control>
diff --git a/addon.xml b/addon.xml
index e55009a..6c7dc11 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.1.47" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.1.5" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>
@@ -145,6 +145,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>Updated Game dialogs</news>
+		<news>Updated PVR code</news>
 	</extension>
 </addon>