from os import path as os_path, remove as os_remove, listdir as os_listdir, system
-from time import strftime
-from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation, eServiceReference, iServiceKeys
+from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys
from Screens.Screen import Screen
from Screens.MessageBox import MessageBox
from Screens.ChoiceBox import ChoiceBox
-from Screens.InputBox import InputBox
from Screens.HelpMenu import HelpableScreen
from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications
from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap
from Components.Label import Label
from Components.FileList import FileList
+from Components.MenuList import MenuList
from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
from Components.config import config
-from Components.ProgressBar import ProgressBar
-from ServiceReference import ServiceReference
from Tools.Directories import pathExists, fileExists
-import random
import servicedvd # load c++ part of dvd player plugin
lastpath = ""
<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):
+ def __init__(self, session, dvd_filelist = None):
Screen.__init__(self, session)
- global lastpath
- if lastpath is not None:
- currDir = lastpath + "/"
+
+ if dvd_filelist:
+ self.dvd_filelist = dvd_filelist
+ self["filelist"] = MenuList(self.dvd_filelist)
+
else:
- currDir = "/media/dvd/"
- if not pathExists(currDir):
- currDir = "/"
- #else:
- #print system("mount "+currDir)
- self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True)
- self["filelist"] = self.filelist
+ self.dvd_filelist = None
+ global lastpath
+ if lastpath is not None:
+ currDir = lastpath + "/"
+ else:
+ currDir = "/media/dvd/"
+ if not pathExists(currDir):
+ currDir = "/"
+
+ self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True)
+ self["filelist"] = self.filelist
self["FilelistActions"] = ActionMap(["OkCancelActions"],
{
})
def ok(self):
- 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])
- 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..."
- self.close(pathname)
+ if self.dvd_filelist:
+ print "OK " + self["filelist"].getCurrent()
+ self.close(self["filelist"].getCurrent())
else:
- self.close(filename)
+ 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])
+ 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..."
+ self.close(pathname)
+ else:
+ self.close(filename)
def exit(self):
self.close(None)
-
+
class DVDSummary(Screen):
skin = """
<screen position="0,0" size="132,64">
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, args = None):
+ def __init__(self, session, dvd_device = None, dvd_filelist = None, 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
})
self.dvd_device = None
self.physicalDVD = False
+ self.dvd_filelist = dvd_filelist
self.onFirstExecBegin.append(self.showFileBrowser)
self.service = None
self.in_menu = False
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.sUser+8)
- self.totalChapters = self.service.info().getInfo(iServiceInformation.sUser+80)
+ 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)
def __titleUpdated(self):
- self.currentTitle = self.service.info().getInfo(iServiceInformation.sUser+9)
- self.totalTitles = self.service.info().getInfo(iServiceInformation.sUser+90)
+ 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()
- #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.DVDdriveCB(True)
else:
- self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
+ self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, self.dvd_filelist)
def DVDdriveCB(self, answer):
if answer == True:
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 and answer == True:
+ seek = self.service.seek()
+ seek.seekTo(self.resume_point)
+ self.hideAfterResume()
def showAfterCuesheetOperation(self):
if not self.in_menu:
from Plugins.Plugin import PluginDescriptor
-#TODO add *.iso to filescanner and ask when more than one iso file is found
-
def filescan_open(list, session, **kwargs):
- for x in list:
- splitted = x.path.split('/')
+ if len(list) == 1 and list[0].mimetype == "video/x-dvd":
+ splitted = list[0].path.split('/')
print "splitted", splitted
if len(splitted) > 2:
if splitted[1] == 'autofs':
- session.open(DVDPlayer, "/dev/%s" %(splitted[2]))
+ session.open(DVDPlayer, dvd_device="/dev/%s" %(splitted[2]))
return
else:
print "splitted[0]", splitted[1]
+ else:
+ dvd_filelist = []
+ for x in list:
+ if x.mimetype == "video/x-dvd-iso":
+ dvd_filelist.append(x.path)
+ if x.mimetype == "video/x-dvd":
+ dvd_filelist.append(x.path.rsplit('/',1)[0])
+ session.open(DVDPlayer, dvd_filelist=dvd_filelist)
def filescan(**kwargs):
from Components.Scanner import Scanner, ScanPath
def checkFile(self, file):
return fileExists(file.path)
- return \
- LocalScanner(mimetypes = None,
+ return [
+ LocalScanner(mimetypes = ["video/x-dvd","video/x-dvd-iso"],
paths_to_scan =
[
ScanPath(path = "video_ts", with_subdirs = False),
+ ScanPath(path = "", with_subdirs = False),
],
name = "DVD",
description = "Play DVD",
openfnc = filescan_open,
- )
+ )]
def Plugins(**kwargs):
return [PluginDescriptor(name = "DVDPlayer", description = "Play DVDs", where = PluginDescriptor.WHERE_MENU, fnc = menu),
git.cweiske.de / enigma2.git / blobdiff