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,
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
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()