[skin.confluence] v3.0.34

- Added player speed controls (tempo) and on-screen indicator
This commit is contained in:
HitcherUK 2016-08-11 15:28:32 +01:00
parent c625864850
commit 59baf3c495
12 changed files with 75 additions and 7 deletions

View File

@ -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</visible>
<visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | Player.IsTempo</visible>
<animation effect="fade" start="0" end="100" time="150">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
<depth>DepthOSD</depth>
@ -73,7 +73,7 @@
<width>20</width>
<height>44</height>
<texture>OSDSeekRewind.png</texture>
<visible>Player.Rewinding</visible>
<visible>Player.Rewinding | [Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)]</visible>
</control>
<control type="image">
<left>80</left>
@ -81,7 +81,7 @@
<width>20</width>
<height>44</height>
<texture>OSDSeekForward.png</texture>
<visible>Player.Forwarding</visible>
<visible>Player.Forwarding | [Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)]</visible>
</control>
<control type="image">
<left>31</left>
@ -97,7 +97,7 @@
<width>40</width>
<height>40</height>
<texture>OSDPlay.png</texture>
<visible>Player.Playing</visible>
<visible>Player.Playing + !Player.IsTempo</visible>
</control>
<control type="image">
<left>28</left>
@ -107,6 +107,14 @@
<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>
@ -115,6 +123,14 @@
<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>
@ -147,6 +163,14 @@
<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>
@ -155,6 +179,14 @@
<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>
@ -163,6 +195,14 @@
<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>
@ -171,6 +211,14 @@
<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>
@ -179,6 +227,14 @@
<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>
</control>
<control type="label">
<description>Seekbar Label</description>

View File

@ -103,6 +103,8 @@
<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.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31043]</value>
<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>

View File

@ -87,7 +87,10 @@
<texturenofocus>OSDRewindNF.png</texturenofocus>
<enable>Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation>
<onclick>PlayerControl(Rewind)</onclick>
<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>
</control>
<control type="togglebutton" id="202">
<width>55</width>
@ -122,7 +125,10 @@
<texturenofocus>OSDForwardNF.png</texturenofocus>
<enable>Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation>
<onclick>PlayerControl(Forward)</onclick>
<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>
</control>
<control type="button" id="205">
<width>55</width>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.confluence" version="3.0.33" name="Confluence" provider-name="Jezz_X, Team Kodi">
<addon id="skin.confluence" version="3.0.34" name="Confluence" provider-name="Jezz_X, Team Kodi">
<requires>
<import addon="xbmc.gui" version="5.12.0"/>
</requires>

View File

@ -1,3 +1,7 @@
[B]3.0.34[/B]
- Added player speed controls (tempo) and on-screen indicator
[B]3.0.33[/B]
- Changed LibrarySettings to MediaSettings

BIN
media/OSD0.8x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
media/OSD0.9x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
media/OSD1.1x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
media/OSD1.2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
media/OSD1.3x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
media/OSD1.4x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
media/OSD1.5x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB