X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9c07bd8592acaee302ac0760d7c0f9da0e2393db..7f399d23032b1e6d39123db87bdfa98a778c9ffd:/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 8a4c8611..6a69de42 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -56,6 +56,10 @@ class FileBrowser(Screen):
 				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)
 
@@ -219,7 +223,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, args = None):
+	def __init__(self, session, dvd_device = None, args = None):
 		Screen.__init__(self, session)
 		InfoBarBase.__init__(self)
 		InfoBarNotifications.__init__(self)
@@ -318,10 +322,26 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 			})
 
 		self.onClose.append(self.__onClose)
+
+		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
+
 		self.onFirstExecBegin.append(self.showFileBrowser)
 		self.service = None
 		self.in_menu = False
-		
+		self.old_aspect = open("/proc/stb/video/aspect", "r").read()
+		self.old_policy = open("/proc/stb/video/policy", "r").read()
+		self.old_wss = open("/proc/stb/denc/0/wss", "r").read()
+
 	def keyNumberGlobal(self, number):
 		print "You pressed number " + str(number)
 		self.session.openWithCallback(self.numberEntered, ChapterZap, number)
@@ -427,7 +447,10 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		#self.__osdSubtitleInfoAvail()
 
 	def askLeavePlayer(self):
-		self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list=[(_("Exit"), "exit"), (_("Return to file browser"), "browser"), (_("Continue playing"), "play")])
+		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")])
 
 	def nextAudioTrack(self):
 		if self.service:
@@ -501,7 +524,19 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		self.askLeavePlayer()
 
 	def showFileBrowser(self):
-		self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
+		if self.physicalDVD:
+			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)
+		else:
+			self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
+	
+	def DVDdriveCB(self, answer):
+		if answer == True:
+			self.FileBrowserClosed(self.dvd_device)
+		else:
+			self.session.openWithCallback(self.FileBrowserClosed, FileBrowser)
 
 	def FileBrowserClosed(self, val):
 		curref = self.session.nav.getCurrentlyPlayingServiceReference()
@@ -531,6 +566,11 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 				pass
 
 	def __onClose(self):
+		for i in (("/proc/stb/video/aspect", self.old_aspect), ("/proc/stb/video/policy", self.old_policy), ("/proc/stb/denc/0/wss", self.old_wss)):
+			try:
+				open(i[0], "w").write(i[1])
+			except IOError:
+				print "restore", i[0], "failed"
 		self.restore_infobar_seek_config()
 		self.session.nav.playService(self.oldService)
 
@@ -578,5 +618,39 @@ def menu(menuid, **kwargs):
 	return []
 
 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('/')
+		print "splitted", splitted
+		if len(splitted) > 2:
+			if splitted[1] == 'autofs':
+				session.open(DVDPlayer, "/dev/%s" %(splitted[2]))
+				return
+			else:
+				print "splitted[0]", splitted[1]
+
+def filescan(**kwargs):
+	from Components.Scanner import Scanner, ScanPath
+
+	# Overwrite checkFile to only detect local
+	class LocalScanner(Scanner):
+		def checkFile(self, file):
+			return fileExists(file.path)
+
+	return \
+		LocalScanner(mimetypes = None,
+			paths_to_scan =
+				[
+					ScanPath(path = "video_ts", 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)]
+	return [PluginDescriptor(name = "DVDPlayer", description = "Play DVDs", where = PluginDescriptor.WHERE_MENU, fnc = menu),
+		 	PluginDescriptor(where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)]