aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorKai Sommerfeld <kai.sommerfeld@gmx.com>2017-12-28 18:46:35 +0100
committerGitHub <noreply@github.com>2017-12-28 18:46:35 +0100
commitffc89f649df30ffce8842debb689317da080a438 (patch)
tree53882764c5e8bf313d1f562f87fe7f3f06df1682 /addons
parentbcd3a8f3543b292a26b55dfb5477aa108a5f32d5 (diff)
parent640ca9388b616d2e9ed4e3de6795d32ba7f1d8a5 (diff)
Merge pull request #13228 from ksooo/pvr-api-5-8-0
[PVR][guiinfo][skin] PVR Addon API 5.8.0: Remove unused/deprecated API functions
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml10
-rw-r--r--addons/skin.estuary/xml/DialogSeekBar.xml31
-rw-r--r--addons/skin.estuary/xml/MusicOSD.xml32
-rw-r--r--addons/skin.estuary/xml/Variables.xml1
-rw-r--r--addons/skin.estuary/xml/VideoOSD.xml26
5 files changed, 89 insertions, 11 deletions
diff --git a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
index ae0afa4237..25a9b6243f 100644
--- a/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
+++ b/addons/skin.estuary/xml/Custom_1109_TopBarOverlay.xml
@@ -88,8 +88,14 @@
<height>100</height>
<width>auto</width>
<visible>!String.isempty(Player.Duration)</visible>
- <visible>Player.HasVideo + !Player.HasGame</visible>
- <visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasEpg</visible>
+ <visible>Player.HasVideo + ![Player.HasGame | VideoPlayer.HasEpg]</visible>
+ </control>
+ <control type="label">
+ <label>$INFO[PVR.EpgEventFinishTime,$LOCALIZE[31080]: ]</label>
+ <shadowcolor>text_shadow</shadowcolor>
+ <height>100</height>
+ <width>auto</width>
+ <visible>VideoPlayer.HasEpg</visible>
</control>
<control type="image">
<top>2</top>
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml
index bbc7fa4cb0..c37eb5a4e0 100644
--- a/addons/skin.estuary/xml/DialogSeekBar.xml
+++ b/addons/skin.estuary/xml/DialogSeekBar.xml
@@ -104,7 +104,20 @@
<wrapmultiline>true</wrapmultiline>
<animation effect="fade" time="200">VisibleChange</animation>
<label>$INFO[Player.TimeRemaining,[COLOR button_focus]$LOCALIZE[31134]:[CR][/COLOR]]</label>
- <visible>![Player.ShowInfo | Window.IsVisible(playerprocessinfo)]</visible>
+ <visible>![Player.ShowInfo | Window.IsVisible(playerprocessinfo) | VideoPlayer.HasEpg]</visible>
+ </control>
+ <control type="label">
+ <top>110</top>
+ <right>20</right>
+ <width>400</width>
+ <height>50</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font30</font>
+ <wrapmultiline>true</wrapmultiline>
+ <animation effect="fade" time="200">VisibleChange</animation>
+ <label>$INFO[PVR.EpgEventRemainingTime,[COLOR button_focus]$LOCALIZE[31134]:[CR][/COLOR]]</label>
+ <visible>![Player.ShowInfo | Window.IsVisible(playerprocessinfo)] + VideoPlayer.HasEpg</visible>
</control>
</control>
<control type="label">
@@ -173,6 +186,7 @@
<info>PVR.timeshiftprogress</info>
<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
<midtexture>colors/white50.png</midtexture>
+ <visible>VideoPlayer.Content(livetv)</visible>
</control>
</control>
<control type="progress">
@@ -180,10 +194,20 @@
<top>70</top>
<width>100%</width>
<height>15</height>
+ <info>PVR.EpgEventProgress</info>
+ <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+ <midtexture colordiffuse="button_focus">colors/white.png</midtexture>
+ <visible>VideoPlayer.HasEpg</visible>
+ </control>
+ <control type="progress">
+ <left>0</left>
+ <top>70</top>
+ <width>100%</width>
+ <height>15</height>
<info>Player.ProgressCache</info>
<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
<midtexture>colors/white50.png</midtexture>
- <visible>!Player.ChannelPreviewActive</visible>
+ <visible>!VideoPlayer.Content(livetv)</visible>
</control>
<control type="progress">
<left>0</left>
@@ -193,6 +217,7 @@
<info>Player.Progress</info>
<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
<midtexture colordiffuse="button_focus">colors/white.png</midtexture>
+ <visible>!VideoPlayer.HasEpg</visible>
</control>
<control type="slider" id="401">
<left>5</left>
@@ -202,7 +227,7 @@
<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
<textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib>
<textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus>
- <visible>!VideoPlayer.Content(livetv)</visible>
+ <visible>!VideoPlayer.HasEpg</visible>
</control>
</control>
<control type="group">
diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml
index 08a5252db3..614a9c6914 100644
--- a/addons/skin.estuary/xml/MusicOSD.xml
+++ b/addons/skin.estuary/xml/MusicOSD.xml
@@ -220,9 +220,8 @@
<textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
<info>Player.Progress</info>
- <visible>Player.SeekEnabled</visible>
+ <visible>Player.SeekEnabled + !Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
<action>seek</action>
- <visible>!Control.HasFocus(87)</visible>
</control>
<control type="slider">
<left>0</left>
@@ -235,9 +234,34 @@
<textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
<info>Player.Progress</info>
- <visible>Player.SeekEnabled</visible>
+ <visible>Player.SeekEnabled + Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
<action>seek</action>
- <visible>Control.HasFocus(87)</visible>
+ </control>
+ <control type="slider">
+ <left>0</left>
+ <top>-5</top>
+ <width>100%</width>
+ <height>25</height>
+ <onup>8010</onup>
+ <ondown>650</ondown>
+ <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+ <textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
+ <textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+ <info>PVR.EpgEventProgress</info>
+ <visible>Player.SeekEnabled + !Control.HasFocus(87) + VideoPlayer.HasEpg</visible>
+ </control>
+ <control type="slider">
+ <left>0</left>
+ <top>-5</top>
+ <width>100%</width>
+ <height>25</height>
+ <onup>8010</onup>
+ <ondown>650</ondown>
+ <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+ <textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
+ <textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+ <info>PVR.EpgEventProgress</info>
+ <visible>Player.SeekEnabled + Control.HasFocus(87) + VideoPlayer.HasEpg</visible>
</control>
</control>
</controls>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index 907d3c57f0..f59f13f5d5 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -200,6 +200,7 @@
<variable name="SeekTimeLabelVar">
<value condition="!String.IsEmpty(Player.SeekNumeric)">[B]$INFO[Player.SeekNumeric(hh:mm:ss)][/B]</value>
<value condition="Player.Seeking">$INFO[Player.SeekTime]$INFO[Player.Duration, / ]</value>
+ <value condition="VideoPlayer.HasEpg">$INFO[PVR.EpgEventElapsedTime]$INFO[PVR.EpgEventDuration, / ]</value>
<value>$INFO[Player.Time]$INFO[Player.Duration, / ]</value>
</variable>
<variable name="VideoOSDHelpTextVar">
diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml
index 51d2c4c9b6..66e24c6c9a 100644
--- a/addons/skin.estuary/xml/VideoOSD.xml
+++ b/addons/skin.estuary/xml/VideoOSD.xml
@@ -207,7 +207,7 @@
<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
<info>Player.Progress</info>
<action>seek</action>
- <visible>!Control.HasFocus(87)</visible>
+ <visible>!Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
</control>
<control type="slider">
<top>-5</top>
@@ -219,7 +219,29 @@
<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
<info>Player.Progress</info>
<action>seek</action>
- <visible>Control.HasFocus(87)</visible>
+ <visible>Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
+ </control>
+ <control type="slider">
+ <top>-5</top>
+ <left>0</left>
+ <width>100%</width>
+ <height>25</height>
+ <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+ <textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
+ <textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+ <info>PVR.EpgEventProgress</info>
+ <visible>!Control.HasFocus(87) + VideoPlayer.HasEpg</visible>
+ </control>
+ <control type="slider">
+ <top>-5</top>
+ <left>0</left>
+ <width>100%</width>
+ <height>25</height>
+ <texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+ <textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
+ <textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+ <info>PVR.EpgEventProgress</info>
+ <visible>Control.HasFocus(87) + VideoPlayer.HasEpg</visible>
</control>
</control>
</control>
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-21 12:01:45 +0000