Add OSD dialog to control tempo

2021-04-18 18:58:34 +02:00 · 2021-04-18 18:58:34 +02:00 · fbe25efc09
commit fbe25efc09
parent 1c0496e33e
4 changed files with 102 additions and 13 deletions
--- a/720p/VideoOSD.xml
+++ b/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>
--- a/addon.xml
+++ b/addon.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.7.13" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.7.14" 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>- Update language files from Transifex.</news>
+		<news>- Add OSD dialog to control tempo for fullscreen video window.</news>
 	</extension>
 </addon>
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,7 @@
+[B]4.7.14[/B]
+
+- Add OSD dialog to control tempo for fullscreen video window
+
 [B]4.7.13[/B]

 - Update language files from Transifex
--- a/language/resource.language.en_gb/strings.po
+++ b/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"