X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c12be1f77fee011b3b414d86730c1c73e3650b4..99c296ce8c61a4393dae09fd78ae54b4510ec6fd:/lib/python/Plugins/Extensions/DVDPlayer/plugin.py diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 79a13e6a..cb5f0e0d 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -12,6 +12,7 @@ from Components.MenuList import MenuList from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase from Components.config import config from Tools.Directories import pathExists, fileExists +from Components.Harddisk import harddiskmanager import servicedvd # load c++ part of dvd player plugin @@ -22,15 +23,13 @@ class FileBrowser(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 + "/" @@ -49,24 +48,31 @@ class FileBrowser(Screen): }) 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): @@ -228,7 +234,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP 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) @@ -270,13 +276,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP iPlayableService.evUser+12: self.__menuClosed }) - self["DVDPlayerDirectionActions"] = HelpableActionMap(self, "DirectionActions", + self["DVDPlayerDirectionActions"] = ActionMap(["DirectionActions"], { #MENU KEY DOWN ACTIONS - "left": (self.keyLeft, _("DVD left key")), - "right": (self.keyRight, _("DVD right key")), - "up": (self.keyUp, _("DVD up key")), - "down": (self.keyDown, _("DVD down key")), + "left": self.keyLeft, + "right": self.keyRight, + "up": self.keyUp, + "down": self.keyDown, #MENU KEY REPEATED ACTIONS "leftRepeated": self.doNothing, @@ -289,13 +295,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP "rightUp": self.doNothing, "upUp": self.doNothing, "downUp": self.doNothing, - }, -2) + }) - self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions", + self["OkCancelActions"] = ActionMap(["OkCancelActions"], { - "ok": (self.keyOk, _("DVD ENTER key")), + "ok": self.keyOk, "cancel": self.keyCancel, - }, -2) + }) self["DVDPlayerPlaybackActions"] = HelpableActionMap(self, "DVDPlayerActions", { @@ -310,7 +316,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP "dvdAudioMenu": (self.enterDVDAudioMenu, _("(show optional DVD audio menu)")), "nextAudioTrack": (self.nextAudioTrack, _("switch to the next audio track")), "nextSubtitleTrack": (self.nextSubtitleTrack, _("switch to the next subtitle language")), - "seekBeginning": (self.seekBeginning, _("Jump to video title 1 (play movie from start)")), + "seekBeginning": self.seekBeginning, }, -2) self["NumberActions"] = NumberActionMap( [ "NumberActions"], @@ -328,18 +334,25 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP }) self.onClose.append(self.__onClose) - + self.physicalDVD = False + self.dvd_device = None if dvd_device: self.dvd_device = dvd_device self.physicalDVD = True else: - if fileExists("/dev/cdroms/cdrom0"): - print "physical dvd found (/dev/cdroms/cdrom0)" - self.dvd_device = "/dev/cdroms/cdrom0" - self.physicalDVD = True - else: - self.dvd_device = None - self.physicalDVD = False + devicepath = harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD()) + if pathExists(devicepath): + from Components.Scanner import scanDevice + res = scanDevice(devicepath) + list = [ (r.description, r, res[r], self.session) for r in res ] + if list: + (desc, scanner, files, session) = list[0] + for file in files: + print file + if file.mimetype == "video/x-dvd": + self.dvd_device = devicepath + print "physical dvd found:", self.dvd_device + self.physicalDVD = True self.dvd_filelist = dvd_filelist self.onFirstExecBegin.append(self.showFileBrowser) @@ -358,13 +371,25 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP if retval > 0: self.zapToNumber(retval) + def getServiceInterface(self, iface): + service = self.service + if service: + attr = getattr(service, iface, None) + if callable(attr): + return attr() + return None + def __serviceStopped(self): self.dvdScreen.hide() - self.service.subtitle().disableSubtitles(self.session.current_dialog.instance) + subs = self.getServiceInterface("subtitle") + if subs: + subs.disableSubtitles(self.session.current_dialog.instance) def serviceStarted(self): #override InfoBarShowHide function self.dvdScreen.show() - self.service.subtitle().enableSubtitles(self.dvdScreen.instance, None) + subs = self.getServiceInterface("subtitle") + if subs: + subs.enableSubtitles(self.dvdScreen.instance, None) def doEofInternal(self, playing): if self.in_menu: @@ -422,122 +447,124 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP print "StringAvail" def __osdAudioInfoAvail(self): - audioTuple = self.service.info().getInfoObject(iServiceInformation.sUser+6) + info = self.getServiceInterface("info") + audioTuple = info and info.getInfoObject(iServiceInformation.sUser+6) print "AudioInfoAvail ", repr(audioTuple) - audioString = "%d: %s (%s)" % (audioTuple[0],audioTuple[1],audioTuple[2]) - self["audioLabel"].setText(audioString) - if audioTuple != self.last_audioTuple and not self.in_menu: - self.doShow() + if audioTuple: + audioString = "%d: %s (%s)" % (audioTuple[0],audioTuple[1],audioTuple[2]) + self["audioLabel"].setText(audioString) + if audioTuple != self.last_audioTuple and not self.in_menu: + self.doShow() self.last_audioTuple = audioTuple def __osdSubtitleInfoAvail(self): - subtitleTuple = self.service.info().getInfoObject(iServiceInformation.sUser+7) + info = self.getServiceInterface("info") + subtitleTuple = info and 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 subtitleTuple != self.last_subtitleTuple and not self.in_menu: - self.doShow() + if subtitleTuple: + subtitleString = "" + if subtitleTuple[0] is not 0: + subtitleString = "%d: %s" % (subtitleTuple[0],subtitleTuple[1]) + self["subtitleLabel"].setText(subtitleString) + 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) - self.totalChapters = self.service.info().getInfo(iServiceInformation.sTotalChapters) - self.setChapterLabel() - print "__chapterUpdated: %d/%d" % (self.currentChapter, self.totalChapters) + info = self.getServiceInterface("info") + if info: + self.currentChapter = info.getInfo(iServiceInformation.sCurrentChapter) + self.totalChapters = info.getInfo(iServiceInformation.sTotalChapters) + self.setChapterLabel() + print "__chapterUpdated: %d/%d" % (self.currentChapter, self.totalChapters) def __titleUpdated(self): - self.currentTitle = self.service.info().getInfo(iServiceInformation.sCurrentTitle) - self.totalTitles = self.service.info().getInfo(iServiceInformation.sTotalTitles) - self.setChapterLabel() - print "__titleUpdated: %d/%d" % (self.currentTitle, self.totalTitles) - if not self.in_menu: - self.doShow() + info = self.getServiceInterface("info") + if info: + self.currentTitle = info.getInfo(iServiceInformation.sCurrentTitle) + self.totalTitles = info.getInfo(iServiceInformation.sTotalTitles) + self.setChapterLabel() + print "__titleUpdated: %d/%d" % (self.currentTitle, self.totalTitles) + if not self.in_menu: + self.doShow() 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 sendKey(self, key): + keys = self.getServiceInterface("keys") + if keys: + keys.keyPressed(key) + return keys def nextAudioTrack(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser) + self.sendKey(iServiceKeys.keyUser) def nextSubtitleTrack(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+1) + self.sendKey(iServiceKeys.keyUser+1) def enterDVDAudioMenu(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+2) + self.sendKey(iServiceKeys.keyUser+2) def nextChapter(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+3) + self.sendKey(iServiceKeys.keyUser+3) def prevChapter(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+4) + self.sendKey(iServiceKeys.keyUser+4) def nextTitle(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+5) + self.sendKey(iServiceKeys.keyUser+5) def prevTitle(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+6) + self.sendKey(iServiceKeys.keyUser+6) def enterDVDMenu(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUser+7) + self.sendKey(iServiceKeys.keyUser+7) def seekBeginning(self): if self.service: seekable = self.getSeek() - if seekable is not None: + if seekable: seekable.seekTo(0) def zapToNumber(self, number): if self.service: seekable = self.getSeek() - if seekable is not None: + if seekable: print "seek to chapter %d" % number seekable.seekChapter(number) # MENU ACTIONS def keyRight(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyRight) + self.sendKey(iServiceKeys.keyRight) def keyLeft(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyLeft) + self.sendKey(iServiceKeys.keyLeft) def keyUp(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyUp) + self.sendKey(iServiceKeys.keyUp) def keyDown(self): - if self.service: - self.service.keys().keyPressed(iServiceKeys.keyDown) + self.sendKey(iServiceKeys.keyDown) def keyOk(self): - if self.service: - if not self.in_menu: - self.toggleInfo() - self.service.keys().keyPressed(iServiceKeys.keyOk) + if self.sendKey(iServiceKeys.keyOk) and not self.in_menu: + self.toggleInfo() def keyCancel(self): self.askLeavePlayer() def showFileBrowser(self): - if self.physicalDVD: - if self.dvd_device == "/dev/cdroms/cdrom0": + if self.physicalDVD and len(self.dvd_filelist) == 0: + if self.dvd_device == harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD()): 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) @@ -546,6 +573,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP self.FileBrowserClosed(self.dvd_device) else: self.session.openWithCallback(self.FileBrowserClosed, FileBrowser) + self.physicalDVD = False def FileBrowserClosed(self, val): curref = self.session.nav.getCurrentlyPlayingServiceReference() @@ -587,9 +615,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP def playLastCB(self, answer): # overwrite infobar cuesheet function print "playLastCB", answer, self.resume_point - if self.service and answer == True: - seek = self.service.seek() - seek.seekTo(self.resume_point) + if self.service: + if answer == True: + seekable = self.getSeek() + if seekable: + seekable.seekTo(self.resume_point) + pause = self.service.pause() + pause.unpause() self.hideAfterResume() def showAfterCuesheetOperation(self):