display id3 tags in media player

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 9b06d1f4f0cb5fd1859a2347b112c0b29dcd4bbc..d2f3c0894896e80b02684532d02a991de89719c2 100644 (file)
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -106,6 +106,10 @@ class MediaPlayer(Screen, InfoBarSeek):
                self.leftKeyTimer = eTimer()
                self.leftKeyTimer.timeout.get().append(self.leftTimerFire)
                
                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):
                self.currList = "filelist"
                
        def doNothing(self):


@@ -123,7 +127,30 @@ class MediaPlayer(Screen, InfoBarSeek):
        def delMPTimer(self):
                del self.rightKeyTimer
                del self.leftKeyTimer
        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()
 
        def fwdTimerFire(self):
                self.fwdKeyTimer.stop()

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 0308a56d691e735ffd4a7d56494c9c214ce2af7a..88b873deb969080c44c213187d9531c4db5c8686 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -355,6 +355,7 @@ int eServiceMP3::getInfo(int w)
        case sTracknumber:
        case sGenre:
                return resIsString;
        case sTracknumber:
        case sGenre:
                return resIsString;

+

        default:
                return resNA;
        }
        default:
                return resNA;
        }