Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PVR] [confluence] [WIP] timeshift GUI #9045

Closed
wants to merge 9 commits into from
Closed

[PVR] [confluence] [WIP] timeshift GUI #9045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d77a540
[PVR] remove unused and undocumented GUI pvr methods
Glenn-1990 Feb 6, 2016
145518f
[PVR] remove unused timeshift code in favour to the new one
Glenn-1990 Feb 6, 2016
322f6a8
[PVR] add timeshift skin conditions
Glenn-1990 Feb 7, 2016
bd7abe4
[Confluence] add timeshift markers
Glenn-1990 Feb 7, 2016
80b36d9
[PVR] fix current position mismatch
Glenn-1990 Feb 7, 2016
0952392
[PVR] timeshift info should be updated first otherwise duration gets …
Glenn-1990 Feb 7, 2016
862ff5e
[PVR] fix jumping progress bar when changing channels
Glenn-1990 Feb 7, 2016
68f20c8
[PVR] fix jumping stream details in OSD when switching channels
Glenn-1990 Feb 7, 2016
e172079
[confluence] show progressbar when timeshifting
Glenn-1990 Feb 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions addons/skin.confluence/720p/DialogSeekBar.xml
View file
Open in desktop
Expand Up @@ -248,6 +248,28 @@
<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
<visible>Player.Seeking</visible>
</control>
<control type="slider" id="1">
<description>Timeshift start marker</description>
<left>20</left>
<top>46</top>
<width>240</width>
<height>8</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>timeshift_marker_nib.png</textureslidernib>
<info>PVR.timeshiftstartprogr</info>
<visible>IntegerGreaterThan(PVR.timeshiftstartprogr,0) + PVR.IsTimeshift</visible>
</control>
<control type="slider" id="1">
<description>Timeshift stop marker</description>
<left>20</left>
<top>46</top>
<width>240</width>
<height>8</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib flipx="true">timeshift_marker_nib.png</textureslidernib>
<info>PVR.timeshiftendprogr</info>
<visible>!IntegerGreaterThan(PVR.timeshiftendprogr,99) + PVR.IsTimeshift</visible>
</control>
</control>
</controls>
</window>
45 changes: 40 additions & 5 deletions addons/skin.confluence/720p/VideoFullScreen.xml
View file
Open in desktop
Expand Up @@ -116,16 +116,30 @@
<label>$LOCALIZE[31040]</label>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<visible>![VideoPlayer.Content(LiveTV) + Player.Recording]</visible>
<visible>![VideoPlayer.Content(LiveTV) + Player.Recording | VideoPlayer.Content(LiveTV) + PVR.IsTimeshift]</visible>
<animation effect="slide" start="0,0" end="0,25" time="0" condition="!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes) + !VideoPlayer.Content(MusicVideos) + !VideoPlayer.Content(LiveTV)">conditional</animation>
</control>
<control type="label" id="1">
<description>Heading label - timeshifting</description>
<left>0</left>
<top>0</top>
<width>910</width>
<height>25</height>
<align>left</align>
<aligny>center</aligny>
<font>font13</font>
<label>$LOCALIZE[31041]: - $INFO[PVR.timeshiftdelay(hh:mm:ss)]</label>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<visible>VideoPlayer.Content(LiveTV) + PVR.IsTimeshift</visible>
</control>
<control type="image" id="1">
<top>0</top>
<width>50</width>
<height>25</height>
<aspectratio align="center" aligny="center">keep</aspectratio>
<texture>PVR-IsRecording.png</texture>
<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive</visible>
<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive + !PVR.IsTimeshift</visible>
</control>
<control type="label" id="1">
<description>Heading label</description>
Expand All @@ -139,7 +153,7 @@
<label>$LOCALIZE[19158]</label>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive</visible>
<visible>VideoPlayer.Content(LiveTV) + Player.Recording + !Player.ChannelPreviewActive + !PVR.IsTimeshift</visible>
</control>
<control type="label" id="1">
<description>Studio label</description>
Expand Down Expand Up @@ -328,7 +342,7 @@
<control type="group" id="1">
<left>330</left>
<top>95r</top>
<visible>!VideoPlayer.Content(LiveTV) | [VideoPlayer.Content(LiveTV) + VideoPlayer.HasEpg]</visible>
<visible>!VideoPlayer.Content(LiveTV) | [VideoPlayer.Content(LiveTV) + VideoPlayer.HasEpg] | [VideoPlayer.Content(LiveTV) + PVR.IsTimeshift]</visible>
<control type="label" id="1">
<visible>!VideoPlayer.Content(LiveTV)</visible>
<left>0</left>
Expand Down Expand Up @@ -359,7 +373,6 @@
<height>16</height>
<info>Player.ProgressCache</info>
<midtexture border="6,0,6,0">OSDProgressMidLight.png</midtexture>
<visible>!Player.ChannelPreviewActive</visible>
</control>
<control type="progress" id="1">
<description>Progressbar</description>
Expand All @@ -369,6 +382,28 @@
<height>16</height>
<info>Player.Progress</info>
</control>
<control type="slider" id="1">
<description>Timeshift buffer start marker</description>
<left>95</left>
<top>15</top>
<width>720</width>
<height>10</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib flipx="true">timeshift_marker_nib.png</textureslidernib>
<info>PVR.timeshiftendprogr</info>
<visible>!IntegerGreaterThan(PVR.timeshiftendprogr,99) + PVR.IsTimeshift</visible>
</control>
<control type="slider" id="1">
<description>Timeshift buffer end marker</description>
<left>100</left>
<top>15</top>
<width>720</width>
<height>10</height>
<texturesliderbar>seekslider.png</texturesliderbar>
<textureslidernib>timeshift_marker_nib.png</textureslidernib>
<info>PVR.timeshiftstartprogr</info>
<visible>IntegerGreaterThan(PVR.timeshiftstartprogr,0) + PVR.IsTimeshift</visible>
</control>
<control type="label" id="1">
<visible>!VideoPlayer.Content(LiveTV)</visible>
<left>820</left>
Expand Down
4 changes: 4 additions & 0 deletions addons/skin.confluence/language/resource.language.en_gb/strings.po
View file
Open in desktop
Expand Up @@ -118,6 +118,10 @@ msgctxt "#31040"
msgid "Now playing"
msgstr ""

msgctxt "#31041"
msgid "Timeshifting"
msgstr ""

#empty string with id 31041

This comment was marked as spam.

Sign in to view


msgctxt "#31042"
Expand Down
Binary file added addons/skin.confluence/media/timeshift_marker_nib.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.