Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / 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 0d1f65fb8eaf4846b2e55caf226b1bd88f47f3a8..421a2b4eb2f7cdd5b6824d5a6f9ad3863e28c30a 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -1,5 +1,5 @@
 from os import path as os_path, remove as os_remove, listdir as os_listdir, system
 from os import path as os_path, remove as os_remove, listdir as os_listdir, system

-from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys
+from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys, getDesktop

 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox


@@ -7,11 +7,13 @@ 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 Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications
 from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap
 from Components.Label import Label

+from Components.Pixmap import Pixmap

 from Components.FileList import FileList
 from Components.MenuList import MenuList
 from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
 from Components.config import config
 from Tools.Directories import pathExists, fileExists
 from Components.FileList import FileList
 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
 
 
 import servicedvd # load c++ part of dvd player plugin
 


@@ -108,10 +110,11 @@ class DVDSummary(Screen):
                self["Title"].setText(title)
 
 class DVDOverlay(Screen):
                self["Title"].setText(title)
 
 class DVDOverlay(Screen):

-       skin = """<screen name="DVDOverlay" position="0,0" size="720,576" flags="wfNoBorder" zPosition="-1" backgroundColor="transparent" />"""

        def __init__(self, session, args = None):
        def __init__(self, session, args = None):

+               desktop_size = getDesktop(0).size()
+               DVDOverlay.skin = """<screen name="DVDOverlay" position="0,0" size="%d,%d" flags="wfNoBorder" zPosition="-1" backgroundColor="transparent" />""" %(desktop_size.width(), desktop_size.height())

                Screen.__init__(self, session)
                Screen.__init__(self, session)

-               
+

 class ChapterZap(Screen):
        skin = """
        <screen name="ChapterZap" position="235,255" size="250,60" title="Chapter" >
 class ChapterZap(Screen):
        skin = """
        <screen name="ChapterZap" position="235,255" size="250,60" title="Chapter" >


@@ -181,14 +184,17 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                <!-- Chapter info -->
                <widget name="chapterLabel" position="230,96" size="360,22" font="Regular;20" foregroundColor="#c3c3c9" backgroundColor="#263c59" transparent="1" />
                <!-- Audio track info -->
                <!-- Chapter info -->
                <widget name="chapterLabel" position="230,96" size="360,22" font="Regular;20" foregroundColor="#c3c3c9" backgroundColor="#263c59" transparent="1" />
                <!-- Audio track info -->

-               <ePixmap pixmap="skin_default/icons/icon_dolby.png" position="540,73" zPosition="1" size="26,16" alphatest="on"/>
-               <widget name="audioLabel" position="570,73" size="130,22" font="Regular;18" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" />
+               <ePixmap pixmap="skin_default/icons/icon_dolby.png" position="540,60" zPosition="1" size="26,16" alphatest="on"/>
+               <widget name="audioLabel" position="570,60" size="130,22" font="Regular;18" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" />

                <!-- Subtitle track info -->
                <!-- Subtitle track info -->

-               <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_txt.png" position="540,96" zPosition="1" size="26,16" alphatest="on" >
+               <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/icon_txt.png" position="540,83" zPosition="1" size="26,16" alphatest="on" >

                        <convert type="ServiceInfo">HasTelext</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
                        <convert type="ServiceInfo">HasTelext</convert>
                        <convert type="ConditionalShowHide" />
                </widget>

-               <widget name="subtitleLabel" position="570,96" size="130,22" font="Regular;18" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" />
+               <widget name="subtitleLabel" position="570,83" size="130,22" font="Regular;18" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" />
+               <!-- Angle info -->
+               <widget name="anglePix" pixmap="skin_default/icons/icon_view.png" position="540,106" size="26,16" alphatest="on" />
+               <widget name="angleLabel" position="570,106" size="130,22" font="Regular;18" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" />

                <!-- Elapsed time -->
                <widget source="session.CurrentService" render="Label" position="205,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
                        <convert type="ServicePosition">Position,ShowHours</convert>
                <!-- Elapsed time -->
                <widget source="session.CurrentService" render="Label" position="205,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
                        <convert type="ServicePosition">Position,ShowHours</convert>


@@ -250,9 +256,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                self.session.nav.stopService()
                self["audioLabel"] = Label("n/a")
                self["subtitleLabel"] = Label("")
                self.session.nav.stopService()
                self["audioLabel"] = Label("n/a")
                self["subtitleLabel"] = Label("")

+               self["angleLabel"] = Label("")

                self["chapterLabel"] = Label("")
                self["chapterLabel"] = Label("")

+               self["anglePix"] = Pixmap()
+               self["anglePix"].hide()

                self.last_audioTuple = None
                self.last_subtitleTuple = None
                self.last_audioTuple = None
                self.last_subtitleTuple = None

+               self.last_angleTuple = None

                self.totalChapters = 0
                self.currentChapter = 0
                self.totalTitles = 0
                self.totalChapters = 0
                self.currentChapter = 0
                self.totalTitles = 0


@@ -272,16 +282,17 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                                iPlayableService.evUser+8: self.__chapterUpdated,
                                iPlayableService.evUser+9: self.__titleUpdated,
                                iPlayableService.evUser+11: self.__menuOpened,
                                iPlayableService.evUser+8: self.__chapterUpdated,
                                iPlayableService.evUser+9: self.__titleUpdated,
                                iPlayableService.evUser+11: self.__menuOpened,

-                               iPlayableService.evUser+12: self.__menuClosed
+                               iPlayableService.evUser+12: self.__menuClosed,
+                               iPlayableService.evUser+13: self.__osdAngleInfoAvail

                        })
 
                        })
 

-               self["DVDPlayerDirectionActions"] = HelpableActionMap(self, "DirectionActions",
+               self["DVDPlayerDirectionActions"] = ActionMap(["DirectionActions"],

                        {
                                #MENU KEY DOWN ACTIONS
                        {
                                #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,
 
                                #MENU KEY REPEATED ACTIONS
                                "leftRepeated": self.doNothing,


@@ -294,13 +305,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                                "rightUp": self.doNothing,
                                "upUp": self.doNothing,
                                "downUp": self.doNothing,
                                "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,
                                "cancel": self.keyCancel,

-                       }, -2)
+                       })

 
                self["DVDPlayerPlaybackActions"] = HelpableActionMap(self, "DVDPlayerActions",
                        {
 
                self["DVDPlayerPlaybackActions"] = HelpableActionMap(self, "DVDPlayerActions",
                        {


@@ -315,7 +326,8 @@ 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")),
                                "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)")),
+                               "nextAngle": (self.nextAngle, _("switch to the next angle")),
+                               "seekBeginning": self.seekBeginning,

                        }, -2)
                        
                self["NumberActions"] = NumberActionMap( [ "NumberActions"],
                        }, -2)
                        
                self["NumberActions"] = NumberActionMap( [ "NumberActions"],


@@ -333,18 +345,25 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                        })
 
                self.onClose.append(self.__onClose)
                        })
 
                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 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)
 
                self.dvd_filelist = dvd_filelist
                self.onFirstExecBegin.append(self.showFileBrowser)


@@ -363,13 +382,22 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                if retval > 0:
                        self.zapToNumber(retval)
 
                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()
        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()
 
        def serviceStarted(self): #override InfoBarShowHide function
                self.dvdScreen.show()

-               self.service.subtitle().enableSubtitles(self.dvdScreen.instance, None)

 
        def doEofInternal(self, playing):
                if self.in_menu:
 
        def doEofInternal(self, playing):
                if self.in_menu:


@@ -427,119 +455,138 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                print "StringAvail"
 
        def __osdAudioInfoAvail(self):
                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)
                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):
                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)
                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
                self.last_subtitleTuple = subtitleTuple

+       
+       def __osdAngleInfoAvail(self):
+               info = self.getServiceInterface("info")
+               angleTuple = info and info.getInfoObject(iServiceInformation.sUser+8)
+               print "AngleInfoAvail ", repr(angleTuple)
+               if angleTuple:
+                       angleString = ""
+                       if angleTuple[1] > 1:
+                               angleString = "%d / %d" % (angleTuple[0],angleTuple[1])
+                               self["anglePix"].show()
+                       else:
+                               self["anglePix"].hide()
+                       self["angleLabel"].setText(angleString)
+                       if angleTuple != self.last_angleTuple and not self.in_menu:
+                               self.doShow()
+               self.last_angleTuple = angleTuple

 
        def __chapterUpdated(self):
 
        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):
 
        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):
                
        def askLeavePlayer(self):

-               choices = [(_("Continue playing"), "play"), (_("Exit"), "exit")]
+               choices = [(_("Exit"), "exit"), (_("Continue playing"), "play")]

                if not self.physicalDVD:
                if not self.physicalDVD:

-                       choices.insert(1,(_("Return to file browser"), "browser"))                      
+                       choices.insert(1,(_("Return to file browser"), "browser"))

                self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices)
 
                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):
        def nextAudioTrack(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser)
+               self.sendKey(iServiceKeys.keyUser)

 
        def nextSubtitleTrack(self):
 
        def nextSubtitleTrack(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+1)
+               self.sendKey(iServiceKeys.keyUser+1)

 
        def enterDVDAudioMenu(self):
 
        def enterDVDAudioMenu(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+2)
+               self.sendKey(iServiceKeys.keyUser+2)

 
        def nextChapter(self):
 
        def nextChapter(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+3)
+               self.sendKey(iServiceKeys.keyUser+3)

 
        def prevChapter(self):
 
        def prevChapter(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+4)
+               self.sendKey(iServiceKeys.keyUser+4)

 
        def nextTitle(self):
 
        def nextTitle(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+5)
+               self.sendKey(iServiceKeys.keyUser+5)

 
        def prevTitle(self):
 
        def prevTitle(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+6)
+               self.sendKey(iServiceKeys.keyUser+6)

 
        def enterDVDMenu(self):
 
        def enterDVDMenu(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUser+7)
+               self.sendKey(iServiceKeys.keyUser+7)
+       
+       def nextAngle(self):
+               self.sendKey(iServiceKeys.keyUser+8)

 
        def seekBeginning(self):
                if self.service:
                        seekable = self.getSeek()
 
        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()
                                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):
                                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):
 
        def keyLeft(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyLeft)
+               self.sendKey(iServiceKeys.keyLeft)

 
        def keyUp(self):
 
        def keyUp(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyUp)
+               self.sendKey(iServiceKeys.keyUp)

 
        def keyDown(self):
 
        def keyDown(self):

-               if self.service:
-                       self.service.keys().keyPressed(iServiceKeys.keyDown)
+               self.sendKey(iServiceKeys.keyDown)

 
        def keyOk(self):
 
        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 and len(self.dvd_filelist) == 0:
 
        def keyCancel(self):
                self.askLeavePlayer()
 
        def showFileBrowser(self):
                if self.physicalDVD and len(self.dvd_filelist) == 0:

-                       if self.dvd_device == "/dev/cdroms/cdrom0":
+                       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)
                                self.session.openWithCallback(self.DVDdriveCB, MessageBox, text=_("Do you want to play DVD in drive?"), timeout=5 )
                        else:
                                self.DVDdriveCB(True)


@@ -568,6 +615,9 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
                                self.service = self.session.nav.getCurrentService()
                                print "self.service", self.service
                                print "cur_dlg", self.session.current_dialog
                                self.service = self.session.nav.getCurrentService()
                                print "self.service", self.service
                                print "cur_dlg", self.session.current_dialog

+                               subs = self.getServiceInterface("subtitle")
+                               if subs:
+                                       subs.enableSubtitles(self.dvdScreen.instance, None)

 
        def exitCB(self, answer):
                if answer is not None:
 
        def exitCB(self, answer):
                if answer is not None:


@@ -596,9 +646,10 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
        def playLastCB(self, answer): # overwrite infobar cuesheet function
                print "playLastCB", answer, self.resume_point
                if self.service:
        def playLastCB(self, answer): # overwrite infobar cuesheet function
                print "playLastCB", answer, self.resume_point
                if self.service:

-                       seek = self.service.seek()

                        if answer == True:
                        if answer == True:

-                               seek.seekTo(self.resume_point)
+                               seekable = self.getSeek()
+                               if seekable:
+                                       seekable.seekTo(self.resume_point)

                        pause = self.service.pause()
                        pause.unpause()
                self.hideAfterResume()
                        pause = self.service.pause()
                        pause.unpause()
                self.hideAfterResume()