X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/78c706dcbf7041327caad5e3942bcb3b8040b0de..29f60fdaf6f0ff1dd112c9e0e913ec734b304bf1:/lib/python/Screens/MediaPlayer.py

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index d2f3c089..21f26ffa 100644
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -21,9 +21,10 @@ import os
 class MediaPlayer(Screen, InfoBarSeek):
 	def __init__(self, session, args = None):
 		Screen.__init__(self, session)
+		self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.nav.stopService()
 		
-		self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|avi)", useServiceRef = True)
+		self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave)", useServiceRef = True)
 		self["filelist"] = self.filelist
 
 		self.playlist = PlayList()
@@ -45,11 +46,20 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self["genre"] = Label("")
 		
 		#self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
-                
-		self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
+
+		class MoviePlayerActionMap(NumberActionMap):
+			def __init__(self, player, contexts = [ ], actions = { }, prio=0):
+				NumberActionMap.__init__(self, contexts, actions, prio)
+				self.player = player
+
+			def action(self, contexts, action):
+				self.player.show()
+				return NumberActionMap.action(self, contexts, action)
+
+		self["actions"] = MoviePlayerActionMap(self, ["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
 		{
 			"ok": self.ok,
-			"cancel": self.close,
+			"cancel": self.exit,
 			
 			"right": self.rightDown,
 			"rightRepeated": self.doNothing,
@@ -115,6 +125,9 @@ class MediaPlayer(Screen, InfoBarSeek):
 	def doNothing(self):
 		pass
 	
+	def exit(self):
+		self.close()
+	
 	def checkSkipShowHideLock(self):
 		self.updatedSeekState()
 	
@@ -122,7 +135,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.nextEntry()
 		
 	def __onClose(self):
-		self.session.nav.playService(None)
+		self.session.nav.playService(self.oldService)
 	
 	def delMPTimer(self):
 		del self.rightKeyTimer
@@ -249,6 +262,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 			menu.append((_("switch to filelist"), "filelist"))
 			menu.append((_("delete"), "delete"))
 			menu.append((_("clear playlist"), "clear"))
+		menu.append((_("hide player"), "hide"));
 		self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
 		
 	def menuCallback(self, choice):
@@ -264,12 +278,16 @@ class MediaPlayer(Screen, InfoBarSeek):
 		elif choice[1] == "filelist":
 			self.switchToFileList()
 		elif choice[1] == "delete":
+			if self.playlist.getSelectionIndex() == self.playlist.getCurrentIndex():
+				self.stopEntry()
 			self.deleteEntry()
 		elif choice[1] == "clear":
 			self.stopEntry()
 			self.playlist.clear()
 			self.switchToFileList()
-			
+		elif choice[1] == "hide":
+			self.hide()
+
 	def copyDirectory(self, directory):
 		filelist = FileList(directory, useServiceRef = True, isTop = True)
 		
@@ -284,7 +302,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.playlist.addFile(self.filelist.getServiceRef())
 		self.playlist.updateList()
 		if len(self.playlist) == 1:
-			self.playEntry()
+			self.changeEntry(0)
 
 	def nextEntry(self):
 		next = self.playlist.getCurrentIndex() + 1
@@ -307,15 +325,15 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.playEntry()
 	
 	def playEntry(self):
-		currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
-		if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference():
-			self.session.nav.playService(self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()])
-			info = eServiceCenter.getInstance().info(currref)
-			description = info.getInfoString(currref, iServiceInformation.sDescription)
-			self["title"].setText(description)
-		self.unPauseService()
-		
-		
+		if len(self.playlist.getServiceRefList()):
+			currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
+			if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference():
+				self.session.nav.playService(self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()])
+				info = eServiceCenter.getInstance().info(currref)
+				description = info and info.getInfoString(currref, iServiceInformation.sDescription) or ""
+				self["title"].setText(description)
+			self.unPauseService()
+				
 	def updatedSeekState(self):
 		if self.seekstate == self.SEEK_STATE_PAUSE:
 			self.playlist.pauseFile()
@@ -340,5 +358,6 @@ class MediaPlayer(Screen, InfoBarSeek):
 	def stopEntry(self):
 		self.playlist.stopFile()
 		self.session.nav.playService(None)
+		self.updateMusicInformation(clear=True)