X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3b90c686f9c7821d8567dc5725ad1565d59e9a89..d26a119a33db3ad39b4930712cef2b15cbaf0f8c:/lib/python/Screens/MediaPlayer.py

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 9b06d1f4..fe1e0a8f 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()
@@ -49,7 +50,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
 		{
 			"ok": self.ok,
-			"cancel": self.close,
+			"cancel": self.exit,
 			
 			"right": self.rightDown,
 			"rightRepeated": self.doNothing,
@@ -106,11 +107,18 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.leftKeyTimer = eTimer()
 		self.leftKeyTimer.timeout.get().append(self.leftTimerFire)
 		
+		self.infoTimer = eTimer()
+		self.infoTimer.timeout.get().append(self.infoTimerFire)
+		self.infoTimer.start(500)
+		
 		self.currList = "filelist"
 		
 	def doNothing(self):
 		pass
 	
+	def exit(self):
+		self.close()
+	
 	def checkSkipShowHideLock(self):
 		self.updatedSeekState()
 	
@@ -118,12 +126,35 @@ 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
 		del self.leftKeyTimer
+		del self.infoTimer
 		
+	def infoTimerFire(self):
+		currPlay = self.session.nav.getCurrentService()
+		if currPlay is not None:
+			self.updateMusicInformation( artist = currPlay.info().getInfoString(iServiceInformation.sArtist),
+										 title = currPlay.info().getInfoString(iServiceInformation.sTitle),
+										 album = currPlay.info().getInfoString(iServiceInformation.sAlbum),
+										 genre = currPlay.info().getInfoString(iServiceInformation.sGenre),
+										 clear = True)
+		else:
+			self.updateMusicInformation()
+	
+	def updateMusicInformation(self, artist = "", title = "", album = "", year = "", genre = "", clear = False):
+		self.updateSingleMusicInformation("artist", artist, clear)
+		self.updateSingleMusicInformation("title", title, clear)
+		self.updateSingleMusicInformation("album", album, clear)
+		self.updateSingleMusicInformation("year", year, clear)
+		self.updateSingleMusicInformation("genre", genre, clear)
+
+	def updateSingleMusicInformation(self, name, info, clear):
+		if info != "" or clear:
+			if self[name].getText() != info:
+				self[name].setText(info)
 
 	def fwdTimerFire(self):
 		self.fwdKeyTimer.stop()
@@ -257,7 +288,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