Merge c3ec30a1bc into acab988c54

720p/DialogSeekBar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol>1</defaultcontrol>
-	<visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | Player.IsTempo</visible>
+	<visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | [Player.IsTempo + !System.IdleTime(3)]</visible>
 	<visible>!Player.HasGame</visible>
 	<visible>!Player.FrameAdvance</visible>
 	<animation effect="fade" start="0" end="100" time="150">WindowOpen</animation>
@@ -114,7 +114,7 @@
 					<width>20</width>
 					<height>44</height>
 					<texture>OSDSeekRewind.png</texture>
-					<visible>Player.Rewinding | [Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)]</visible>
+					<visible>Player.Rewinding</visible>
 				</control>
 				<control type="image">
 					<left>80</left>
@@ -122,7 +122,7 @@
 					<width>20</width>
 					<height>44</height>
 					<texture>OSDSeekForward.png</texture>
-					<visible>Player.Forwarding | [Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)]</visible>
+					<visible>Player.Forwarding | Player.IsTempo</visible>
 				</control>
 				<control type="image">
 					<left>31</left>
@@ -148,14 +148,6 @@
 					<texture>OSD2x.png</texture>
 					<visible>Player.Rewinding2x</visible>
 				</control>
-				<control type="image">
-					<left>28</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD0.9x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,0.90)</visible>
-				</control>
 				<control type="image">
 					<left>25</left>
 					<top>4</top>
@@ -164,14 +156,6 @@
 					<texture>OSD4x.png</texture>
 					<visible>Player.Rewinding4x</visible>
 				</control>
-				<control type="image">
-					<left>25</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD0.8x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,0.80)</visible>
-				</control>
 				<control type="image">
 					<left>22</left>
 					<top>4</top>
@@ -204,14 +188,6 @@
 					<texture>OSD2x.png</texture>
 					<visible>Player.Forwarding2x</visible>
 				</control>
-				<control type="image">
-					<left>34</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD1.1x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,1.10)</visible>
-				</control>
 				<control type="image">
 					<left>37</left>
 					<top>4</top>
@@ -220,14 +196,6 @@
 					<texture>OSD4x.png</texture>
 					<visible>Player.Forwarding4x</visible>
 				</control>
-				<control type="image">
-					<left>37</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD1.2x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,1.20)</visible>
-				</control>
 				<control type="image">
 					<left>40</left>
 					<top>4</top>
@@ -236,14 +204,6 @@
 					<texture>OSD8x.png</texture>
 					<visible>Player.Forwarding8x</visible>
 				</control>
-				<control type="image">
-					<left>40</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD1.3x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,1.30)</visible>
-				</control>
 				<control type="image">
 					<left>43</left>
 					<top>4</top>
@@ -252,14 +212,6 @@
 					<texture>OSD16x.png</texture>
 					<visible>Player.Forwarding16x</visible>
 				</control>
-				<control type="image">
-					<left>43</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD1.4x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,1.40)</visible>
-				</control>
 				<control type="image">
 					<left>45</left>
 					<top>4</top>
@@ -268,13 +220,33 @@
 					<texture>OSD32x.png</texture>
 					<visible>Player.Forwarding32x</visible>
 				</control>
-				<control type="image">
-					<left>45</left>
-					<top>4</top>
-					<width>40</width>
-					<height>40</height>
-					<texture>OSD1.5x.png</texture>
-					<visible>String.IsEqual(Player.PlaySpeed,1.50)</visible>
+				<control type="group">
+					<visible>Player.IsTempo</visible>
+					<left>24</left>
+					<top>3</top>
+					<animation effect="slide" end="3,0" condition="String.IsEqual(Player.PlaySpeed,0.90)">Conditional</animation>
+					<animation effect="slide" end="9,0" condition="String.IsEqual(Player.PlaySpeed,1.10)">Conditional</animation>
+					<animation effect="slide" end="12,0" condition="String.IsEqual(Player.PlaySpeed,1.20)">Conditional</animation>
+					<animation effect="slide" end="15,0" condition="String.IsEqual(Player.PlaySpeed,1.30)">Conditional</animation>
+					<animation effect="slide" end="18,0" condition="String.IsEqual(Player.PlaySpeed,1.40)">Conditional</animation>
+					<animation effect="slide" end="20,0" condition="String.IsEqual(Player.PlaySpeed,1.50) | String.IsEqual(Player.PlaySpeed,1.60) | String.IsEqual(Player.PlaySpeed,1.70) | String.IsEqual(Player.PlaySpeed,1.80) | String.IsEqual(Player.PlaySpeed,1.90) | String.IsEqual(Player.PlaySpeed,2.00) | String.IsEqual(Player.PlaySpeed,2.10)">Conditional</animation>
+					<control type="image">
+						<left>1</left>
+						<top>1</top>
+						<width>40</width>
+						<height>40</height>
+						<texture>OSDClean.png</texture>
+					</control>
+					<control type="label">
+						<description>Playspeed Label</description>
+						<width>40</width>
+						<height>40</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<font>OSDPlaySpeed</font>
+						<textcolor>white</textcolor>
+						<label>[I]$VAR[PlaySpeed][/I]</label>
+					</control>
 				</control>
 			</control>
 			<control type="label">

720p/Font.xml

@@ -83,6 +83,11 @@
 			<filename>Roboto-Bold.ttf</filename>
 			<size>80</size>
 		</font>
+		<font>
+			<name>OSDPlaySpeed</name>
+			<filename>Roboto-Bold.ttf</filename>
+			<size>9</size>
+		</font>
 	</fontset>
 	<fontset id="Massive" idloc="15110">
 		<!-- Normal Fonts -->
@@ -167,6 +172,11 @@
 			<filename>Roboto-Bold.ttf</filename>
 			<size>80</size>
 		</font>
+		<font>
+			<name>OSDPlaySpeed</name>
+			<filename>Roboto-Bold.ttf</filename>
+			<size>9</size>
+		</font>
 	</fontset>
 	<fontset id="DefaultNoCaps" idloc="31391">
 		<!-- Normal Fonts -->
@@ -251,6 +261,11 @@
 			<filename>Roboto-Bold.ttf</filename>
 			<size>80</size>
 		</font>
+		<font>
+			<name>OSDPlaySpeed</name>
+			<filename>Roboto-Bold.ttf</filename>
+			<size>9</size>
+		</font>
 	</fontset>
 	<fontset id="Arial" idloc="31392">
 		<!-- Arial Font better for non English -->
@@ -344,5 +359,11 @@
 			<size>80</size>
 			<style>bold</style>
 		</font>
+		<font>
+			<name>OSDPlaySpeed</name>
+			<filename>arial.ttf</filename>
+			<size>8</size>
+			<style>bold</style>
+		</font>
 	</fontset>
 </fonts>

720p/Includes.xml

@@ -486,6 +486,22 @@
 		<value condition="!String.IsEmpty(Player.Art(tvshow.poster))">$INFO[Player.Art(tvshow.poster)]</value>
 		<value>$INFO[Player.Icon]</value>
 	</variable>
+	<variable name="PlaySpeed">
+		<value condition="String.IsEqual(Player.PlaySpeed,0.80)">0.8X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,0.90)">0.9X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.10)">1.1X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.20)">1.2X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.30)">1.3X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.40)">1.4X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.50)">1.5X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.60)">1.6X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.70)">1.7X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.80)">1.8X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,1.90)">1.9X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,2.00)">2X</value>
+		<value condition="String.IsEqual(Player.PlaySpeed,2.10)">2.1X</value>
+		<value>$INFO[Player.PlaySpeed]</value>
+	</variable>
 	<variable name="MusicInfoPanelLabel">
 		<value condition="Container.Content(Artists)">$INFO[ListItem.Label]</value>
 		<value condition="Container.Content(Songs)">$INFO[ListItem.Label,[COLOR=selected][B],[/B][/COLOR] - ]$INFO[ListItem.Label2]</value>
@@ -527,9 +543,7 @@
 		<value>$INFO[ListItem.VideoCodec]</value>
 	</variable>
 	<variable name="SeekLabel">
-		<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)">$LOCALIZE[31045]</value>
-		<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)">$LOCALIZE[31044]</value>
-		<value condition="Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31042]</value>
+		<value condition="[Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek] | Player.IsTempo">$LOCALIZE[31042]</value>
 		<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
 		<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
 		<value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>

720p/VideoOSD.xml

@@ -87,10 +87,7 @@
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
 				<enable>Player.SeekEnabled</enable>
 				<animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation>
-				<onclick condition="!Player.Paused + !Player.IsTempo">PlayerControl(Rewind)</onclick>
-				<onclick condition="Player.Paused + Player.TempoEnabled">PlayerControl(Play)</onclick>
-				<onclick condition="Player.Paused + Player.TempoEnabled">PlayerControl(TempoDown)</onclick>
-				<onclick condition="Player.IsTempo + Player.TempoEnabled">PlayerControl(TempoDown)</onclick>
+				<onclick>PlayerControl(Rewind)</onclick>
 			</control>
 			<control type="togglebutton" id="202">
 				<width>55</width>
@@ -103,6 +100,7 @@
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
 				<alttexturefocus>OSDPlayFO.png</alttexturefocus>
 				<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
+				<onup condition="Player.TempoEnabled">400</onup>
 				<onclick>PlayerControl(Play)</onclick>
 				<enable>Player.PauseEnabled</enable>
 				<animation effect="fade" start="100" end="50" time="75" condition="!Player.PauseEnabled">Conditional</animation>
@@ -125,10 +123,7 @@
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
 				<enable>Player.SeekEnabled</enable>
 				<animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation>
-				<onclick condition="!Player.Paused + !Player.IsTempo">PlayerControl(Forward)</onclick>
-				<onclick condition="Player.Paused + Player.TempoEnabled">PlayerControl(Play)</onclick>
-				<onclick condition="Player.Paused + Player.TempoEnabled">PlayerControl(TempoUp)</onclick>
-				<onclick condition="Player.IsTempo + Player.TempoEnabled">PlayerControl(TempoUp)</onclick>
+				<onclick>PlayerControl(Forward)</onclick>
 			</control>
 			<control type="button" id="205">
 				<width>55</width>
@@ -264,7 +259,7 @@
 		</control>
 		<control type="button" id="410">
 			<description>Fake button for mouse control</description>
-			<right>145</right>
+			<left>334</left>
 			<bottom>60</bottom>
 			<width>256</width>
 			<height>250</height>
@@ -273,7 +268,7 @@
 			<texturenofocus/>
 			<texturefocus/>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
-			<visible>Control.HasFocus(410) | Control.HasFocus(250) | ControlGroup(400).HasFocus</visible>
+			<visible>Control.HasFocus(410) | Control.HasFocus(202) | ControlGroup(400).HasFocus</visible>
 		</control>
 		<control type="button" id="520">
 			<description>Fake button for mouse control</description>
@@ -288,6 +283,92 @@
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
 			<visible>Control.HasFocus(520) | Control.HasFocus(255) | ControlGroup(500).HasFocus</visible>
 		</control>
+		<control type="grouplist" id="400">
+			<depth>DepthOSD+</depth>
+			<visible>Player.TempoEnabled + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(202) | ControlGroup(400).HasFocus | Control.HasFocus(410)]</visible>
+			<animation effect="fade" time="150">VisibleChange</animation>
+			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
+			<left>334</left>
+			<bottom>45</bottom>
+			<width>256</width>
+			<height>140</height>
+			<itemgap>0</itemgap>
+			<orientation>vertical</orientation>
+			<include>VisibleFadeEffect</include>
+			<control type="group">
+				<description>Header</description>
+				<width>256</width>
+				<height>40</height>
+				<control type="image">
+					<description>Header</description>
+					<left>0</left>
+					<top>0</top>
+					<width>256</width>
+					<height>40</height>
+					<texture border="20,18,20,0">SubMenuBack-Header.png</texture>
+				</control>
+				<control type="label">
+					<left>0</left>
+					<top>20</top>
+					<width>256</width>
+					<height>15</height>
+					<font>font12</font>
+					<label>31022</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
+			</control>
+			<control type="group">
+				<width>256</width>
+				<height>40</height>
+				<control type="image">
+					<width>256</width>
+					<height>40</height>
+					<texture border="25,5,25,5">SubMenuBack-MiddleNF.png</texture>
+				</control>
+				<control type="label">
+					<left>30</left>
+					<width>130</width>
+					<height>40</height>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<label>$INFO[Player.playspeed]</label>
+				</control>
+				<control type="button" id="504">
+					<top>9</top>
+					<left>165</left>
+					<width>33</width>
+					<height>22</height>
+					<texturefocus>scroll-down-focus-2.png</texturefocus>
+					<texturenofocus>scroll-down-2.png</texturenofocus>
+					<onleft>505</onleft>
+					<onright>505</onright>
+					<onup>202</onup>
+					<ondown>202</ondown>
+					<onclick>PlayerControl(TempoDown)</onclick>
+				</control>
+				<control type="button" id="505">
+					<top>9</top>
+					<left>198</left>
+					<width>33</width>
+					<height>22</height>
+					<texturefocus>scroll-up-focus-2.png</texturefocus>
+					<texturenofocus>scroll-up-2.png</texturenofocus>
+					<onleft>504</onleft>
+					<onright>504</onright>
+					<onup>202</onup>
+					<ondown>202</ondown>
+					<onclick>PlayerControl(TempoUp)</onclick>
+				</control>
+			</control>
+			<control type="image" id="549">
+				<description>Footer</description>
+				<width>256</width>
+				<height>52</height>
+				<texture border="20,0,20,50">SubMenuBack-Footer.png</texture>
+			</control>
+		</control>
 		<control type="grouplist" id="500">
 			<depth>DepthOSD+</depth>
 			<visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)]</visible>

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.7.14" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.7.15" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.15.0"/>
 	</requires>
@@ -143,6 +143,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>- Add PVR guide controls dialog.[CR]- Updated language files from Transifex.</news>
+		<news>- Add OSD dialog to control tempo for fullscreen video window.</news>
 	</extension>
 </addon>

changelog.txt

@@ -2,6 +2,10 @@
 
 - Add PVR guide controls dialog
 
+[B]4.7.15[/B]
+
+- Add OSD dialog to control tempo for fullscreen video window
+
 [B]4.7.13[/B]
 
 - Updated language files from Transifex

language/resource.language.en_gb/strings.po

@@ -88,7 +88,11 @@ msgctxt "#31017"
 msgid "Unavailable"
 msgstr ""
 
-#empty strings from id 31018 to 31022
+#empty strings from id 31018 to 31021
+
+msgctxt "#31022"
+msgid "Play speed"
+msgstr ""
 
 msgctxt "#31023"
 msgid "Playing"