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()
self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
{
"ok": self.ok,
- "cancel": self.close,
+ "cancel": self.exit,
"right": self.rightDown,
"rightRepeated": self.doNothing,
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()
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()
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