<screen name="FileBrowser" position="100,100" size="520,376" title="DVD File Browser" >
<widget name="filelist" position="0,0" size="520,376" scrollbarMode="showOnDemand" />
</screen>"""
- def __init__(self, session, dvd_filelist = None):
+ def __init__(self, session, dvd_filelist = [ ]):
Screen.__init__(self, session)
- if dvd_filelist:
- self.dvd_filelist = dvd_filelist
+ self.dvd_filelist = dvd_filelist
+ if len(dvd_filelist):
self["filelist"] = MenuList(self.dvd_filelist)
-
else:
- self.dvd_filelist = None
global lastpath
if lastpath is not None:
currDir = lastpath + "/"
})
def ok(self):
- if self.dvd_filelist:
+ if len(self.dvd_filelist):
print "OK " + self["filelist"].getCurrent()
self.close(self["filelist"].getCurrent())
else:
global lastpath
filename = self["filelist"].getFilename()
if filename is not None:
- lastpath = filename[0:filename.rfind("/")]
if filename.upper().endswith("VIDEO_TS/"):
print "dvd structure found, trying to open..."
- self.close(filename[0:-9])
+ dvdpath = filename[0:-9]
+ lastpath = (dvdpath.rstrip("/").rsplit("/",1))[0]
+ print "lastpath video_ts/=", lastpath
+ self.close(dvdpath)
+ return
if self["filelist"].canDescent(): # isDir
self["filelist"].descent()
pathname = self["filelist"].getCurrentDirectory() or ""
if fileExists(pathname+"VIDEO_TS.IFO"):
print "dvd structure found, trying to open..."
+ lastpath = (pathname.rstrip("/").rsplit("/",1))[0]
+ print "lastpath video_ts.ifo=", lastpath
self.close(pathname)
else:
+ lastpath = filename[0:filename.rfind("/")]
+ print "lastpath directory=", lastpath
self.close(filename)
def exit(self):
self.Timer.callback.append(self.keyOK)
self.Timer.start(3000, True)
-class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen):
-#InfoBarCueSheetSupport,
+class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport):
# ALLOW_SUSPEND = True
-# ENABLE_RESUME_SUPPORT = True
+ ENABLE_RESUME_SUPPORT = True
skin = """
<screen name="DVDPlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent" >
config.seek.stepwise_repeat.value = self.saved_config_seek_stepwise_repeat
config.seek.on_pause.value = self.saved_config_seek_on_pause
- def __init__(self, session, dvd_device = None, dvd_filelist = None, args = None):
+ def __init__(self, session, dvd_device = None, dvd_filelist = [ ], args = None):
Screen.__init__(self, session)
InfoBarBase.__init__(self)
InfoBarNotifications.__init__(self)
-# InfoBarCueSheetSupport.__init__(self, actionmap = "MediaPlayerCueSheetActions")
+ InfoBarCueSheetSupport.__init__(self, actionmap = "MediaPlayerCueSheetActions")
InfoBarShowHide.__init__(self)
HelpableScreen.__init__(self)
self.save_infobar_seek_config()
self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
self.session.nav.stopService()
- self["audioLabel"] = Label("1")
+ self["audioLabel"] = Label("n/a")
self["subtitleLabel"] = Label("")
self["chapterLabel"] = Label("")
+ self.last_audioTuple = None
+ self.last_subtitleTuple = None
self.totalChapters = 0
self.currentChapter = 0
self.totalTitles = 0
iPlayableService.evUser+7: self.__osdSubtitleInfoAvail,
iPlayableService.evUser+8: self.__chapterUpdated,
iPlayableService.evUser+9: self.__titleUpdated,
- #iPlayableService.evUser+10: self.__initializeDVDinfo,
iPlayableService.evUser+11: self.__menuOpened,
iPlayableService.evUser+12: self.__menuClosed
})
print "StringAvail"
def __osdAudioInfoAvail(self):
- audioString = self.service.info().getInfoString(iServiceInformation.sUser+6)
- print "AudioInfoAvail "+audioString
+ audioTuple = self.service.info().getInfoObject(iServiceInformation.sUser+6)
+ print "AudioInfoAvail ", repr(audioTuple)
+ audioString = "%d: %s (%s)" % (audioTuple[0],audioTuple[1],audioTuple[2])
self["audioLabel"].setText(audioString)
- if not self.in_menu:
+ if audioTuple != self.last_audioTuple and not self.in_menu:
self.doShow()
+ self.last_audioTuple = audioTuple
def __osdSubtitleInfoAvail(self):
- subtitleString = self.service.info().getInfoString(iServiceInformation.sUser+7)
- print "SubtitleInfoAvail "+subtitleString
+ subtitleTuple = self.service.info().getInfoObject(iServiceInformation.sUser+7)
+ print "SubtitleInfoAvail ", repr(subtitleTuple)
+ subtitleString = ""
+ if subtitleTuple[0] is not 0:
+ subtitleString = "%d: %s" % (subtitleTuple[0],subtitleTuple[1])
self["subtitleLabel"].setText(subtitleString)
- if not self.in_menu:
+ if subtitleTuple != self.last_subtitleTuple and not self.in_menu:
self.doShow()
+ self.last_subtitleTuple = subtitleTuple
def __chapterUpdated(self):
self.currentChapter = self.service.info().getInfo(iServiceInformation.sCurrentChapter)
if not self.in_menu:
self.doShow()
- #def __initializeDVDinfo(self):
- #self.__osdAudioInfoAvail()
- #self.__osdSubtitleInfoAvail()
-
def askLeavePlayer(self):
- if self.physicalDVD:
- self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list=[(_("Continue playing"), "play"), (_("Exit"), "exit")])
- else:
- self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list=[(_("Continue playing"), "play"), (_("Return to file browser"), "browser"), (_("Exit"), "exit")])
+ choices = [(_("Continue playing"), "play"), (_("Exit"), "exit")]
+ if not self.physicalDVD:
+ choices.insert(1,(_("Return to file browser"), "browser"))
+ self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices)
def nextAudioTrack(self):
if self.service:
self.askLeavePlayer()
def showFileBrowser(self):
- if self.physicalDVD:
+ if self.physicalDVD and len(self.dvd_filelist) == 0:
if self.dvd_device == "/dev/cdroms/cdrom0":
self.session.openWithCallback(self.DVDdriveCB, MessageBox, text=_("Do you want to play DVD in drive?"), timeout=5 )
else:
self.DVDdriveCB(True)
+ elif len(self.dvd_filelist) == 1:
+ self.FileBrowserClosed(self.dvd_filelist[0])
else:
self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, self.dvd_filelist)
self.FileBrowserClosed(self.dvd_device)
else:
self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
+ self.physicalDVD = False
def FileBrowserClosed(self, val):
curref = self.session.nav.getCurrentlyPlayingServiceReference()
self.restore_infobar_seek_config()
self.session.nav.playService(self.oldService)
-# def playLastCB(self, answer): # overwrite infobar cuesheet function
-# print "playLastCB", answer, self.resume_point
-# pos = self.resume_point
-# title = self.resume_point % 90000
-# pos -= title
-# chapter = title % 256
-# title /= 256
-# print "pos", pos, "title", title, "chapter", chapter
-# if self.service:
-# seek = self.service.seek()
-# if title != 1:
-# seek.seekTitle(title)
-# self.resume_state = 1
-# elif chapter != 1:
-# seek.seekChapter(chapter)
-# self.resume_state = 2
-# else:
-# seek.seekTo(pos)
-# self.hideAfterResume()
+ def playLastCB(self, answer): # overwrite infobar cuesheet function
+ print "playLastCB", answer, self.resume_point
+ if self.service:
+ seek = self.service.seek()
+ if answer == True:
+ seek.seekTo(self.resume_point)
+ pause = self.service.pause()
+ pause.unpause()
+ self.hideAfterResume()
def showAfterCuesheetOperation(self):
if not self.in_menu:
git.cweiske.de / enigma2.git / blobdiff