movie player configuration options, by Anders Holst

1 files changed, 37 insertions, 6 deletions

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 80b4239e..90aa2dc3 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -149,29 +149,60 @@ class MoviePlayer(InfoBarShowHide, \
 
 		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.nav.playService(service)
+		self.returning = False
 
 	def leavePlayer(self):
 		self.is_closing = True
 
-		list = []
-		list.append((_("Yes"), "quit"))
-		list.append((_("No"), "continue"))
-		if config.usage.setup_level.index >= 2: # expert+
-			list.append((_("No, but restart from begin"), "restart"))
-		self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+		if config.usage.on_movie_stop.value == "ask":
+			list = []
+			list.append((_("Yes"), "quit"))
+			if config.usage.setup_level.index >= 2: # expert+
+				list.append((_("Yes, returning to movie list"), "movielist"))
+			list.append((_("No"), "continue"))
+			if config.usage.setup_level.index >= 2: # expert+
+				list.append((_("No, but restart from begin"), "restart"))
+			self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+		else:
+			self.leavePlayerConfirmed([True, config.usage.on_movie_stop.value])
 
 	def leavePlayerConfirmed(self, answer):
 		answer = answer and answer[1]
 		if answer == "quit":
 			self.session.nav.playService(self.lastservice)
 			self.close()
+		elif answer == "movielist":
+			ref = self.session.nav.getCurrentlyPlayingServiceReference()
+			self.returning = True
+			self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+			self.session.nav.playService(self.lastservice)
 		elif answer == "restart":
 			self.doSeek(0)
 
+	def doEofInternal(self, playing):
+		if not playing:
+			return
+		self.is_closing = True
+		if config.usage.on_movie_eof.value == "ask":
+			list = []
+			list.append((_("Yes"), "quit"))
+			if config.usage.setup_level.index >= 2: # expert+
+				list.append((_("Yes, returning to movie list"), "movielist"))
+			list.append((_("No"), "continue"))
+			if config.usage.setup_level.index >= 2: # expert+
+				list.append((_("No, but restart from begin"), "restart"))
+			self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+		else:
+			self.leavePlayerConfirmed([True, config.usage.on_movie_eof.value])
+
 	def showMovies(self):
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
 
 	def movieSelected(self, service):
 		if service is not None:
+			self.is_closing = False
 			self.session.nav.playService(service)
+			self.returning = False
+		elif self.returning:
+			self.close()