don't crash when there is no info

[enigma2.git] / lib / python / Screens / MediaPlayer.py

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 9b06d1f4f0cb5fd1859a2347b112c0b29dcd4bbc..5a461848b58429595e9213b805cd70c46dcf8af6 100644 (file)
--- 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
@@ -280,15 +311,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()