Partial Revert "Confluence: add extra PVR buttons to support pause and seek"

This reverts commit 43000267dd308482f2864b46c43aa738edd4d6bc.

2 files changed, 36 insertions, 149 deletions

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index d96a3a2c94..fb62336446 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -449,14 +449,14 @@
 			<onleft>9000</onleft>
 			<onright>9000</onright>
 			<onup>20</onup>
-			<ondown>609</ondown>
+			<ondown>608</ondown>
 			<visible>false</visible>
 		</control>
 		<control type="group">
 			<description>Controls for currently playing media</description>
 			<posx>545r</posx>
 			<posy>370</posy>
-			<animation effect="slide" start="0,0" end="395,0" time="300" condition="!Player.HasMedia">conditional</animation>
+			<animation effect="slide" start="0,0" end="365,0" time="300" condition="!Player.HasMedia">conditional</animation>
 			<animation type="WindowOpen" reversible="false">
 				<effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" />
 				<effect type="fade" start="0" end="100" time="300" />
@@ -473,9 +473,9 @@
 				<height>35</height>
 				<colordiffuse>CCFFFFFF</colordiffuse>
 				<texture flipy="true" border="0,5,0,0" flipx="true">HomeSubEnd.png</texture>
-				<animation effect="slide" start="0,0" end="115,0" time="0" condition="!System.HasAddon(script.globalsearch)">Conditional</animation>
+				<animation effect="slide" start="0,0" end="145,0" time="0" condition="!System.HasAddon(script.globalsearch)">Conditional</animation>
 			</control>
-			<control type="radiobutton" id="609">
+			<control type="radiobutton" id="608">
 				<colordiffuse>CCFFFFFF</colordiffuse>
 				<description>Global Search</description>
 				<posx>35</posx>
@@ -496,14 +496,14 @@
 				<onclick>RunScript(script.globalsearch)</onclick>
 				<textureradiofocus>icon_search.png</textureradiofocus>
 				<textureradionofocus>icon_search.png</textureradionofocus>
-				<onleft>608</onleft>
+				<onleft>607</onleft>
 				<onright>601</onright>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
 				<visible>System.HasAddon(script.globalsearch)</visible>
 			</control>
 			<control type="group" id="600">
-				<posx>150</posx>
+				<posx>180</posx>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
 				<defaultcontrol>-</defaultcontrol>
@@ -512,7 +512,7 @@
 					<description>Background image</description>
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>235</width>
+					<width>205</width>
 					<height>35</height>
 					<texture flipy="true" border="0,5,0,0">HomeSubNF.png</texture>
 					<colordiffuse>CCFFFFFF</colordiffuse>
@@ -527,7 +527,7 @@
 						<label>-</label>
 						<texturefocus>OSDPrevTrackFO.png</texturefocus>
 						<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
-						<onleft>609</onleft>
+						<onleft>608</onleft>
 						<onright>602</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
@@ -602,15 +602,11 @@
 						<texturefocus>OSDNextTrackFO.png</texturefocus>
 						<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 						<onleft>605</onleft>
-						<onright>608</onright>
+						<onright>607</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
 						<onclick>XBMC.PlayerControl(Next)</onclick>
 					</control>
-					<control type="button" id="607">
-						<description>Fake Button to fix Player Controls Navigation</description>
-						<visible>false</visible>
-					</control>
 				</control>
 				<control type="group" id="600">
 					<visible>VideoPlayer.Content(LiveTV)</visible>
@@ -622,7 +618,7 @@
 						<label>-</label>
 						<texturefocus>OSDChannelUPFO.png</texturefocus>
 						<texturenofocus>OSDChannelUPNF.png</texturenofocus>
-						<onleft>609</onleft>
+						<onleft>608</onleft>
 						<onright>602</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
@@ -642,50 +638,15 @@
 						<ondown>9000</ondown>
 						<onclick>XBMC.PlayerControl(Next)</onclick>
 					</control>
-					<control type="togglebutton" id="603">
+					<control type="button" id="603">
 						<posx>70</posx>
 						<posy>2</posy>
 						<width>30</width>
 						<height>30</height>
 						<label>-</label>
-						<texturefocus>OSDPauseFO.png</texturefocus>
-						<texturenofocus>OSDPauseNF.png</texturenofocus>
-						<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
-						<alttexturefocus>OSDPlayFO.png</alttexturefocus>
-						<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
-						<onleft>602</onleft>
-						<onright>604</onright>
-						<onup>9003</onup>
-						<ondown>9000</ondown>
-						<onclick>XBMC.PlayerControl(Play)</onclick>
-						<enable>Player.PauseEnabled</enable>
-						<animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation>
-					</control>
-					<control type="button" id="604">
-						<posx>100</posx>
-						<posy>2</posy>
-						<width>30</width>
-						<height>30</height>
-						<label>-</label>
-						<texturefocus>OSDRewindFO.png</texturefocus>
-						<texturenofocus>OSDRewindNF.png</texturenofocus>
-						<onleft>603</onleft>
-						<onright>605</onright>
-						<onup>9003</onup>
-						<ondown>9000</ondown>
-						<onclick>XBMC.PlayerControl(Rewind)</onclick>
-						<enable>Player.SeekEnabled</enable>
-						<animation effect="fade" start="100" end="30" time="100" condition="!Player.SeekEnabled">Conditional</animation>
-					</control>
-					<control type="button" id="605">
-						<posx>130</posx>
-						<posy>2</posy>
-						<width>30</width>
-						<height>30</height>
-						<label>-</label>
 						<texturefocus>OSDStopFO.png</texturefocus>
 						<texturenofocus>OSDStopNF.png</texturenofocus>
-						<onleft>604</onleft>
+						<onleft>602</onleft>
 						<onright>606</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
@@ -693,38 +654,22 @@
 						<onclick>XBMC.PlayerControl(Stop)</onclick>
 					</control>
 					<control type="button" id="606">
-						<posx>160</posx>
-						<posy>2</posy>
-						<width>30</width>
-						<height>30</height>
-						<label>-</label>
-						<texturefocus>OSDForwardFO.png</texturefocus>
-						<texturenofocus>OSDForwardNF.png</texturenofocus>
-						<onleft>605</onleft>
-						<onright>607</onright>
-						<onup>9003</onup>
-						<ondown>9000</ondown>
-						<onclick>XBMC.PlayerControl(Forward)</onclick>
-						<enable>Player.SeekEnabled</enable>
-						<animation effect="fade" start="100" end="30" time="100" condition="!Player.SeekEnabled">Conditional</animation>
-					</control>
-					<control type="button" id="607">
-						<posx>190</posx>
+						<posx>130</posx>
 						<posy>2</posy>
 						<width>30</width>
 						<height>30</height>
 						<label>-</label>
 						<texturefocus>OSDRecordOffFO.png</texturefocus>
 						<texturenofocus>OSDRecordOffNF.png</texturenofocus>
-						<onleft>606</onleft>
-						<onright>608</onright>
+						<onleft>603</onleft>
+						<onright>607</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
 						<onclick>XBMC.PlayerControl(record)</onclick>
 					</control>
 				</control>
 			</control>
-			<control type="radiobutton" id="608">
+			<control type="radiobutton" id="607">
 				<colordiffuse>CCFFFFFF</colordiffuse>
 				<description>Go to fullscreen Playback</description>
 				<posx>385</posx>
@@ -745,8 +690,8 @@
 				<onclick>fullscreen</onclick>
 				<textureradiofocus>GoFullscreen.png</textureradiofocus>
 				<textureradionofocus>GoFullscreen.png</textureradionofocus>
-				<onleft>607</onleft>
-				<onright>609</onright>
+				<onleft>606</onleft>
+				<onright>608</onright>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
 				<enable>Player.HasMedia</enable>
@@ -845,7 +790,7 @@
 				<height>60</height>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
-				<onup condition="System.HasAddon(script.globalsearch)">609</onup>
+				<onup condition="System.HasAddon(script.globalsearch)">608</onup>
 				<onup condition="!System.HasAddon(script.globalsearch)">603</onup>
 				<ondown>9001</ondown>
 				<pagecontrol>-</pagecontrol>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index 675d712fb5..945000f66c 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -588,7 +588,7 @@
 		</control>
 		<control type="group" id="9006">
 			<width>250</width>
-			<height>90</height>
+			<height>45</height>
 			<visible>VideoPlayer.Content(LiveTV)</visible>
 			<include>VisibleFadeEffect</include>
 			<control type="button" id="600">
@@ -597,38 +597,29 @@
 				<width>39</width>
 				<height>39</height>
 				<label>-</label>
-				<texturefocus>OSDRewindFO.png</texturefocus>
-				<texturenofocus>OSDRewindNF.png</texturenofocus>
+				<texturefocus>OSDChannelUPFO.png</texturefocus>
+				<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 				<onleft>50</onleft>
 				<onright>601</onright>
 				<onup>610</onup>
-				<ondown>605</ondown>
-				<onback>50</onback>
-				<onclick>XBMC.PlayerControl(Rewind)</onclick>
-				<enable>Player.SeekEnabled</enable>
-				<animation effect="fade" start="100" end="30" time="100" condition="!Player.SeekEnabled">Conditional</animation>
+				<ondown>611</ondown>
+				<onclick>XBMC.PlayerControl(Previous)</onclick>
 			</control>
-			<control type="togglebutton" id="601">
+			<control type="button" id="601">
 				<posx>60</posx>
 				<posy>2</posy>
 				<width>39</width>
 				<height>39</height>
 				<label>-</label>
-				<texturefocus>OSDPauseFO.png</texturefocus>
-				<texturenofocus>OSDPauseNF.png</texturenofocus>
-				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
-				<alttexturefocus>OSDPlayFO.png</alttexturefocus>
-				<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
+				<texturefocus>OSDChannelDownFO.png</texturefocus>
+				<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 				<onleft>600</onleft>
-				<onright>602</onright>
+				<onright>603</onright>
 				<onup>610</onup>
-				<ondown>606</ondown>
-				<onback>50</onback>
-				<onclick>XBMC.PlayerControl(Play)</onclick>
-				<enable>Player.PauseEnabled</enable>
-				<animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation>
-			</control>			
-			<control type="button" id="602">
+				<ondown>611</ondown>
+				<onclick>XBMC.PlayerControl(Next)</onclick>
+			</control>
+			<control type="button" id="603">
 				<posx>100</posx>
 				<posy>2</posy>
 				<width>39</width>
@@ -637,30 +628,12 @@
 				<texturefocus>OSDStopFO.png</texturefocus>
 				<texturenofocus>OSDStopNF.png</texturenofocus>
 				<onleft>601</onleft>
-				<onright>603</onright>
+				<onright>604</onright>
 				<onup>610</onup>
-				<ondown>606</ondown>
-				<onback>50</onback>
+				<ondown>611</ondown>
 				<onclick>down</onclick>
 				<onclick>XBMC.PlayerControl(Stop)</onclick>
 			</control>
-			<control type="button" id="603">
-				<posx>140</posx>
-				<posy>2</posy>
-				<width>39</width>
-				<height>39</height>
-				<label>-</label>
-				<texturefocus>OSDForwardFO.png</texturefocus>
-				<texturenofocus>OSDForwardNF.png</texturenofocus>
-				<onleft>602</onleft>
-				<onright>604</onright>
-				<onup>610</onup>
-				<ondown>606</ondown>
-				<onback>50</onback>
-				<onclick>XBMC.PlayerControl(Forward)</onclick>
-				<enable>Player.SeekEnabled</enable>
-				<animation effect="fade" start="100" end="30" time="100" condition="!Player.SeekEnabled">Conditional</animation>
-			</control>
 			<control type="button" id="604">
 				<posx>180</posx>
 				<posy>2</posy>
@@ -670,44 +643,13 @@
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 				<onleft>603</onleft>
-				<onright>605</onright>
+				<onright>50</onright>
 				<onup>610</onup>
-				<ondown>606</ondown>
-				<onback>50</onback>
+				<ondown>611</ondown>
 				<onclick>XBMC.PlayerControl(record)</onclick>
 				<enable>Player.CanRecord</enable>
 				<animation effect="fade" start="100" end="30" time="100" condition="!Player.CanRecord">Conditional</animation>
 			</control>
-			<control type="button" id="605">
-				<posx>20</posx>
-				<posy>42</posy>
-				<width>39</width>
-				<height>39</height>
-				<label>-</label>
-				<texturefocus>OSDChannelUPFO.png</texturefocus>
-				<texturenofocus>OSDChannelUPNF.png</texturenofocus>
-				<onleft>604</onleft>
-				<onright>606</onright>
-				<onup>600</onup>
-				<ondown>611</ondown>
-				<onback>50</onback>
-				<onclick>XBMC.PlayerControl(Previous)</onclick>
-			</control>
-			<control type="button" id="606">
-				<posx>60</posx>
-				<posy>42</posy>
-				<width>39</width>
-				<height>39</height>
-				<label>-</label>
-				<texturefocus>OSDChannelDownFO.png</texturefocus>
-				<texturenofocus>OSDChannelDownNF.png</texturenofocus>
-				<onleft>605</onleft>
-				<onright>50</onright>
-				<onup>601</onup>
-				<ondown>611</ondown>
-				<onback>50</onback>
-				<onclick>XBMC.PlayerControl(Next)</onclick>
-			</control>
 		</control>
 		<control type="group" id="9005">
 			<visible>[Player.HasAudio | Player.HasVideo]</visible>