X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ef1a9823a5da0c626766dad7afc858e15b57a2d0..63ad55839aa3ab4902c4e62063259a49a17e7f49:/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 fd048695..45c5ddee 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -147,9 +147,10 @@ class ChapterZap(Screen):
 		self.Timer.callback.append(self.keyOK)
 		self.Timer.start(3000, True)
 
-class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarCueSheetSupport, InfoBarPVRState, InfoBarShowHide, HelpableScreen):
-	ALLOW_SUSPEND = True
-	ENABLE_RESUME_SUPPORT = True
+class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen):
+#InfoBarCueSheetSupport, 
+#	ALLOW_SUSPEND = True
+#	ENABLE_RESUME_SUPPORT = True
 	
 	skin = """
 	<screen name="DVDPlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent" >
@@ -222,7 +223,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC
 		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()
@@ -339,10 +340,12 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC
 	def __menuOpened(self):
 		self.hide()
 		self.in_menu = True
+		self["NumberActions"].setEnabled(False)
 
 	def __menuClosed(self):
 		self.show()
 		self.in_menu = False
+		self["NumberActions"].setEnabled(True)
 
 	def setChapterLabel(self):
 		chapterLCD = "Menu"
@@ -529,6 +532,26 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC
 		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 showAfterCuesheetOperation(self):
 		if not self.in_menu:
 			self.show()
@@ -537,6 +560,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC
 		print "DVDCreateSummary"
 		return DVDSummary
 
+#override some InfoBarSeek functions
+	def doEof(self):
+		self.setSeekState(self.SEEK_STATE_PLAY)
+
+	def calcRemainingTime(self):
+		return 0
+
 def main(session, **kwargs):
 	session.open(DVDPlayer)