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

Update timeshift.py - introduce pause/play on IPTV #368

Merged
merged 1 commit into from Jan 22, 2019
Merged

Update timeshift.py - introduce pause/play on IPTV #368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 39 additions & 13 deletions lib/python/Components/Timeshift.py
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
from Tools.Directories import pathExists, fileExists, getRecordingFilename, copyfile, resolveFilename, SCOPE_TIMESHIFT
from Tools.TimeShift import CopyTimeshiftJob, MergeTimeshiftJob, CreateAPSCFilesJob

from enigma import eBackgroundFileEraser, eTimer, eServiceCenter, iServiceInformation, iPlayableService, eEPGCache
from enigma import eBackgroundFileEraser, eTimer, eServiceCenter, iServiceInformation, iPlayableService, eEPGCache, eServiceReference
from boxbranding import getBoxType, getBrandOEM

from time import time, localtime, strftime
Expand All @@ -62,8 +62,17 @@ def __init__(self):
"timeshiftStart": (self.startTimeshift, _("Start timeshift")), # the "yellow key"
"timeshiftStop": (self.stopTimeshift, _("Stop timeshift")), # currently undefined :), probably 'TV'
"instantRecord": self.instantRecord,
"restartTimeshift": self.restartTimeshift
"restartTimeshift": self.restartTimeshift,
"seekFwdManual": (self.seekFwdManual, _("Seek forward (enter time)")),
"seekBackManual": (self.seekBackManual, _("Seek backward (enter time)")),
"seekdef:1": (boundFunction(self.seekdef,1), _("Seek")),
"seekdef:3": (boundFunction(self.seekdef,3), _("Seek")),
"seekdef:4": (boundFunction(self.seekdef,4), _("Seek")),
"seekdef:6": (boundFunction(self.seekdef,6), _("Seek")),
"seekdef:7": (boundFunction(self.seekdef,7), _("Seek")),
"seekdef:9": (boundFunction(self.seekdef,9), _("Seek"))
}, prio=1)

self["TimeshiftActivateActions"] = ActionMap(["InfobarTimeshiftActivateActions"],
{
"timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "rewind key"
Expand Down Expand Up @@ -313,24 +322,46 @@ def __evEventInfoChanged(self):
# print 'TS AUTO START TEST5'
self.pts_delay_timer.start(1000, True)

def seekdef(self, key):
if self.seekstate == self.SEEK_STATE_PLAY:
return 0 # trade as unhandled action
time = (-config.seek.selfdefined_13.value, False, config.seek.selfdefined_13.value,
-config.seek.selfdefined_46.value, False, config.seek.selfdefined_46.value,
-config.seek.selfdefined_79.value, False, config.seek.selfdefined_79.value)[key-1]
self.doSeekRelative(time * 90000)
self.pvrStateDialog.show()
return 1

def getTimeshift(self):
service = self.session.nav.getCurrentService()
return service and service.timeshift()

def playpauseService2(self):
service = self.session.nav.getCurrentService()
playingref = self.session.nav.getCurrentlyPlayingServiceReference()
if not playingref or playingref.type < eServiceReference.idUser:
return 0
if service and service.streamed():
pauseable = service.pause()
if pauseable:
if self.seekstate == self.SEEK_STATE_PLAY:
pauseable.pause()
self.seekstate = self.SEEK_STATE_PAUSE
else:
pauseable.unpause()
self.seekstate = self.SEEK_STATE_PLAY
return
return 0

def timeshiftEnabled(self):
ts = self.getTimeshift()
return ts and ts.isTimeshiftEnabled()

def startTimeshift(self):
if self.session.nav.getCurrentlyPlayingServiceReference() and 'http' in self.session.nav.getCurrentlyPlayingServiceReference().toString():
if config.timeshift.stream_warning.value:
self.session.open(MessageBox, _("Timeshift on a stream is not supported!"), MessageBox.TYPE_ERROR, timeout=5)
print '[Timeshift] unable to activate, due being on a stream.'
return
ts = self.getTimeshift()
if ts is None:
# self.session.open(MessageBox, _("Timeshift not possible!"), MessageBox.TYPE_ERROR, timeout=5)
return 0
return self.playpauseService2()

if ts.isTimeshiftEnabled():
print "hu, timeshift already enabled?"
Expand Down Expand Up @@ -477,11 +508,6 @@ def eraseTimeshiftFile(self):

def autostartPermanentTimeshift(self):
self["TimeshiftActions"].setEnabled(True)
if self.session.nav.getCurrentlyPlayingServiceReference() and 'http' in self.session.nav.getCurrentlyPlayingServiceReference().toString() and int(config.timeshift.startdelay.value):
if config.timeshift.stream_warning.value:
self.session.open(MessageBox, _("Timeshift on a stream is not supported!"), MessageBox.TYPE_ERROR, timeout=5)
print '[Timeshift] unable to activate, due being on a stream.'
return
ts = self.getTimeshift()
if ts is None:
# print '[TimeShift] tune lock failed, so could not start.'
Expand Down