aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addons/skin.estuary/xml/DialogPlayerProcessInfo.xml2
-rw-r--r--addons/skin.estuary/xml/DialogSeekBar.xml151
-rw-r--r--addons/skin.estuary/xml/Includes_PVR.xml87
-rw-r--r--addons/skin.estuary/xml/MusicOSD.xml30
-rw-r--r--addons/skin.estuary/xml/VideoOSD.xml30
5 files changed, 182 insertions, 118 deletions
diff --git a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
index 53c4567c60..5dbbaf8361 100644
--- a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
+++ b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
@@ -8,7 +8,7 @@
<control type="group">
<bottom>0</bottom>
<height>250</height>
- <animation effect="slide" end="0,-80" time="150" condition="PVR.IsTimeShift">conditional</animation>
+ <animation effect="slide" end="0,-20" time="150" condition="VideoPlayer.Content(LiveTV)">conditional</animation>
<control type="image">
<left>10</left>
<top>-240</top>
diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml
index a307f28ce0..b4b4d6de91 100644
--- a/addons/skin.estuary/xml/DialogSeekBar.xml
+++ b/addons/skin.estuary/xml/DialogSeekBar.xml
@@ -143,107 +143,83 @@
<label>$VAR[SeekLabel]</label>
<shadowcolor>black</shadowcolor>
</control>
- <control type="group" id="6000">
- <top>-5</top>
- <visible>PVR.IsTimeShift + !Player.ChannelPreviewActive</visible>
- <animation effect="fade" time="300">VisibleChange</animation>
- <control type="label">
- <top>0</top>
- <right>20</right>
- <width>400</width>
- <height>50</height>
- <align>right</align>
- <aligny>center</aligny>
- <font>font30</font>
- <label>$INFO[PVR.TimeShiftEnd]</label>
+ <control type="group">
+ <visible>VideoPlayer.Content(LiveTV)</visible>
+ <control type="group">
+ <visible>Player.SeekEnabled + VideoPlayer.HasEPG</visible>
+ <include content="PVRProgress">
+ <param name="ts_bar_top" value="70"/>
+ <param name="epg_bar_top" value="78"/>
+ <param name="ts_bar_height" value="8"/>
+ <param name="epg_bar_height" value="8"/>
+ </include>
</control>
- <control type="label">
- <top>0</top>
- <left>20</left>
- <width>400</width>
- <height>50</height>
- <align>left</align>
- <aligny>center</aligny>
- <font>font30</font>
- <label>$INFO[PVR.TimeShiftStart]</label>
+ <control type="group">
+ <visible>Player.SeekEnabled + !VideoPlayer.HasEPG</visible>
+ <include content="PVRProgress">
+ <param name="ts_bar_top" value="70"/>
+ <param name="ts_bar_height" value="16"/>
+ </include>
</control>
- <control type="label">
- <top>0</top>
- <left>20</left>
- <right>20</right>
- <height>50</height>
- <align>center</align>
- <aligny>center</aligny>
- <font>font30</font>
- <label>[B]$LOCALIZE[31026][/B] $INFO[PVR.TimeshiftCur] (-$INFO[PVR.TimeshiftOffset])</label>
+ <control type="group">
+ <visible>!Player.SeekEnabled + VideoPlayer.HasEPG</visible>
+ <include content="PVRProgress">
+ <param name="epg_bar_top" value="70"/>
+ <param name="epg_bar_height" value="16"/>
+ </include>
+ </control>
+ <control type="group">
+ <visible>!Player.SeekEnabled + !VideoPlayer.HasEPG</visible>
+ <include content="PVRProgress"/>
+ </control>
+ <control type="slider" id="403">
+ <left>0</left>
+ <top>65</top>
+ <width>100%</width>
+ <height>26</height>
+ <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>Player.SeekEnabled + !Player.ChannelPreviewActive</visible>
</control>
+ </control>
+ <control type="group">
+ <visible>!VideoPlayer.Content(LiveTV)</visible>
<control type="progress">
<left>0</left>
- <top>50</top>
+ <top>70</top>
<width>100%</width>
- <height>15</height>
- <info>PVR.timeshiftprogress</info>
- <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+ <height>16</height>
+ <info>Player.ProgressCache</info>
+ <texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg>
<midtexture>colors/white50.png</midtexture>
- <visible>VideoPlayer.Content(livetv)</visible>
</control>
- </control>
- <control type="progress">
- <left>0</left>
- <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>!VideoPlayer.Content(livetv)</visible>
- </control>
- <control type="progress">
- <left>0</left>
- <top>70</top>
- <width>100%</width>
- <height>15</height>
- <info>Player.Progress</info>
- <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
- <midtexture colordiffuse="button_focus">colors/white.png</midtexture>
- <visible>!VideoPlayer.HasEpg + !Player.ChannelPreviewActive</visible>
- </control>
- <control type="slider" id="401">
- <left>5</left>
- <top>65</top>
- <width>100%</width>
- <height>25</height>
- <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>Player.SeekEnabled + !VideoPlayer.HasEpg + !Player.ChannelPreviewActive</visible>
- </control>
- <control type="slider" id="402">
- <left>5</left>
- <top>65</top>
- <width>100%</width>
- <height>25</height>
- <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>Player.SeekEnabled + VideoPlayer.HasEpg + !Player.ChannelPreviewActive</visible>
+ <control type="progress">
+ <left>0</left>
+ <top>70</top>
+ <width>100%</width>
+ <height>16</height>
+ <info>Player.Progress</info>
+ <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+ <midtexture colordiffuse="button_focus">colors/white.png</midtexture>
+ </control>
+ <control type="slider" id="401">
+ <left>0</left>
+ <top>65</top>
+ <width>100%</width>
+ <height>26</height>
+ <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>Player.SeekEnabled</visible>
+ </control>
</control>
</control>
<control type="group">
<visible>!Window.IsVisible(playerprocessinfo)</visible>
<visible>Player.ShowInfo + VideoPlayer.Content(LiveTV)</visible>
<animation effect="fade" time="400">VisibleChange</animation>
- <animation effect="slide" end="0,-80" time="150" condition="Control.IsVisible(6000)">conditional</animation>
+ <animation effect="slide" end="0,-20" time="150" condition="VideoPlayer.Content(LiveTV)">conditional</animation>
<bottom>0</bottom>
<height>380</height>
<control type="label">
@@ -295,7 +271,6 @@
<visible>Player.ShowInfo + !VideoPlayer.Content(LiveTV) + Window.IsActive(fullscreenvideo)</visible>
<animation effect="fade" time="200">VisibleChange</animation>
<control type="group">
- <animation effect="slide" end="0,-80" time="150" condition="PVR.IsTimeShift">conditional</animation>
<control type="image">
<depth>DepthOSD+</depth>
<left>10</left>
diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml
index 938eb63dad..8ec061bee3 100644
--- a/addons/skin.estuary/xml/Includes_PVR.xml
+++ b/addons/skin.estuary/xml/Includes_PVR.xml
@@ -101,6 +101,93 @@
<orientation>vertical</orientation>
</control>
</include>
+ <include name="PVRProgress">
+ <control type="group">
+ <animation effect="fade" time="400">VisibleChange</animation>
+ <visible>!Player.ChannelPreviewActive</visible>
+ <control type="group">
+ <visible>Player.SeekEnabled | VideoPlayer.HasEPG</visible>
+ <control type="label">
+ <top>22</top>
+ <right>20</right>
+ <width>400</width>
+ <height>50</height>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font30</font>
+ <label>$INFO[PVR.TimeshiftProgressEndTime]</label>
+ </control>
+ <control type="label">
+ <top>22</top>
+ <left>20</left>
+ <width>400</width>
+ <height>50</height>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font30</font>
+ <label>$INFO[PVR.TimeshiftProgressStartTime]</label>
+ </control>
+ <control type="label">
+ <top>22</top>
+ <left>20</left>
+ <right>20</right>
+ <height>50</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font30</font>
+ <label>[B]$LOCALIZE[31026][/B] $INFO[PVR.TimeshiftCur] (-$INFO[PVR.TimeshiftOffset])</label>
+ <visible>PVR.IsTimeShift</visible>
+ </control>
+ </control>
+ <control type="group">
+ <visible>VideoPlayer.HasEPG</visible>
+ <control type="progress">
+ <left>0</left>
+ <top>$PARAM[epg_bar_top]</top>
+ <width>100%</width>
+ <height>$PARAM[epg_bar_height]</height>
+ <info2>PVR.TimeshiftProgressEpgStart</info2>
+ <info>PVR.TimeshiftProgressPlayPos</info>
+ <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+ <midtexture colordiffuse="button_focus">colors/white.png</midtexture>
+ </control>
+ <control type="progress">
+ <left>0</left>
+ <top>$PARAM[epg_bar_top]</top>
+ <width>100%</width>
+ <height>$PARAM[epg_bar_height]</height>
+ <info2>PVR.TimeshiftProgressPlayPos</info2>
+ <info>PVR.TimeshiftProgressEpgEnd</info>
+ <texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg>
+ <midtexture>colors/white50.png</midtexture>
+ </control>
+ </control>
+ <control type="progress">
+ <left>0</left>
+ <top>$PARAM[ts_bar_top]</top>
+ <width>100%</width>
+ <height>$PARAM[ts_bar_height]</height>
+ <info2>PVR.TimeshiftProgressBufferStart</info2>
+ <info>PVR.TimeshiftProgressBufferEnd</info>
+ <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+ <midtexture>colors/white70.png</midtexture>
+ <visible>Player.SeekEnabled</visible>
+ </control>
+ </control>
+ <control type="group">
+ <animation effect="fade" time="400">VisibleChange</animation>
+ <visible>Player.ChannelPreviewActive</visible>
+ <control type="progress">
+ <left>0</left>
+ <top>70</top>
+ <width>100%</width>
+ <height>16</height>
+ <info>PVR.EpgEventProgress</info>
+ <texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
+ <midtexture colordiffuse="button_focus">colors/white.png</midtexture>
+ </control>
+ </control>
+ </include>
<include name="PVRInfoPanel">
<control type="group">
<visible>!ListItem.IsFolder</visible>
diff --git a/addons/skin.estuary/xml/MusicOSD.xml b/addons/skin.estuary/xml/MusicOSD.xml
index 0ce7dc5025..6097c0729b 100644
--- a/addons/skin.estuary/xml/MusicOSD.xml
+++ b/addons/skin.estuary/xml/MusicOSD.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<window>
+ <onload condition="!Player.PauseEnabled">SetFocus(603)</onload>
<defaultcontrol always="true">602</defaultcontrol>
<depth>DepthOSD</depth>
<controls>
@@ -62,6 +63,7 @@
<radioposy>0</radioposy>
<selected>Player.Paused</selected>
<onclick>PlayerControl(Play)</onclick>
+ <visible>Player.PauseEnabled</visible>
</control>
<control type="radiobutton" id="603">
<include content="OSDButton">
@@ -183,13 +185,13 @@
</control>
</control>
<control type="label">
- <right>30</right>
+ <animation effect="slide" end="0,-20" time="150" condition="MusicPlayer.Content(LiveTV)">conditional</animation>
+ <right>20</right>
<top>-60</top>
- <textoffsetx>20</textoffsetx>
<aligny>center</aligny>
<align>right</align>
- <width>1858</width>
- <height>60</height>
+ <width>1000</width>
+ <height>50</height>
<label>$VAR[MusicOSDHelpTextVar]</label>
</control>
</control>
@@ -213,55 +215,55 @@
<left>0</left>
<top>-5</top>
<width>100%</width>
- <height>25</height>
+ <height>26</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>Player.Progress</info>
- <visible>Player.SeekEnabled + !Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
+ <visible>Player.SeekEnabled + !Control.HasFocus(87) + !MusicPlayer.Content(LiveTV)</visible>
<action>seek</action>
</control>
<control type="slider">
<left>0</left>
<top>-5</top>
<width>100%</width>
- <height>25</height>
+ <height>26</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>Player.Progress</info>
- <visible>Player.SeekEnabled + Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
+ <visible>Player.SeekEnabled + Control.HasFocus(87) + !MusicPlayer.Content(LiveTV)</visible>
<action>seek</action>
</control>
<control type="slider">
<left>0</left>
<top>-5</top>
<width>100%</width>
- <height>25</height>
+ <height>26</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>
+ <info>PVR.TimeshiftProgressPlayPos</info>
+ <visible>Player.SeekEnabled + !Control.HasFocus(87) + MusicPlayer.Content(LiveTV)</visible>
</control>
<control type="slider">
<left>0</left>
<top>-5</top>
<width>100%</width>
- <height>25</height>
+ <height>26</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>
+ <info>PVR.TimeshiftProgressPlayPos</info>
+ <visible>Player.SeekEnabled + Control.HasFocus(87) + MusicPlayer.Content(LiveTV)</visible>
</control>
</control>
</controls>
diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml
index 7c33235890..aeae829efc 100644
--- a/addons/skin.estuary/xml/VideoOSD.xml
+++ b/addons/skin.estuary/xml/VideoOSD.xml
@@ -21,15 +21,15 @@
<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo) | Window.IsVisible(osdcmssettings) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide)]</visible>
<animation effect="fade" time="200">VisibleChange</animation>
<control type="label">
- <right>30</right>
+ <animation effect="slide" end="0,-20" time="150" condition="VideoPlayer.Content(LiveTV)">conditional</animation>
+ <right>20</right>
<top>0</top>
<align>right</align>
- <textoffsetx>20</textoffsetx>
<aligny>center</aligny>
<width>1000</width>
- <height>60</height>
+ <height>50</height>
<label>$VAR[VideoOSDHelpTextVar]</label>
- <visible>!Player.ShowInfo + !PVR.IsTimeShift</visible>
+ <visible>!Player.ShowInfo</visible>
</control>
<control type="group" id="200">
<control type="grouplist" id="201">
@@ -140,7 +140,7 @@
</include>
<onclick>Dialog.Close(VideoOSD)</onclick>
<onclick>ActivateWindow(pvrchannelguide)</onclick>
- <visible>VideoPlayer.Content(livetv)</visible>
+ <visible>VideoPlayer.Content(livetv) + VideoPlayer.HasEPG</visible>
</control>
<control type="radiobutton" id="700">
<include content="OSDButton">
@@ -199,47 +199,47 @@
<top>-5</top>
<left>0</left>
<width>100%</width>
- <height>25</height>
+ <height>26</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>Player.Progress</info>
<action>seek</action>
- <visible>!Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
+ <visible>!Control.HasFocus(87) + !VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="slider">
<top>-5</top>
<left>0</left>
<width>100%</width>
- <height>25</height>
+ <height>26</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>Player.Progress</info>
<action>seek</action>
- <visible>Control.HasFocus(87) + !VideoPlayer.HasEpg</visible>
+ <visible>Control.HasFocus(87) + !VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="slider">
<top>-5</top>
<left>0</left>
<width>100%</width>
- <height>25</height>
+ <height>26</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>
+ <info>PVR.TimeshiftProgressPlayPos</info>
+ <visible>!Control.HasFocus(87) + VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="slider">
<top>-5</top>
<left>0</left>
<width>100%</width>
- <height>25</height>
+ <height>26</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>
+ <info>PVR.TimeshiftProgressPlayPos</info>
+ <visible>Control.HasFocus(87) + VideoPlayer.Content(LiveTV)</visible>
</control>
</control>
</control>
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-12 09:39:28 +0000