X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/55125a070ce39f188225a32c664a97d8271fdcfc..ab26adc86e6198e65e20d6bf707a6011208111ce:/lib/python/Plugins/Extensions/MediaPlayer/plugin.py diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 8ef1f2fe..752a036b 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -176,7 +176,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { - iPlayableService.evUpdatedInfo: self.__evUpdatedInfo + iPlayableService.evUpdatedInfo: self.__evUpdatedInfo, + iPlayableService.evUser+11: self.__evDecodeError }) def doNothing(self): @@ -217,6 +218,12 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB print "[__evUpdatedInfo] title %d of %d (%s)" % (currenttitle, totaltitles, sTitle) self.readTitleInformation() + def __evDecodeError(self): + currPlay = self.session.nav.getCurrentService() + sVideoType = currPlay.info().getInfoString(iServiceInformation.sVideoType) + print "[__evDecodeError] video-codec %s can't be decoded by hardware" % (sVideoType) + self.session.open(MessageBox, _("This Dreambox can't decode %s video streams!") % sVideoType, type = MessageBox.TYPE_INFO,timeout = 10 ) + def delMPTimer(self): del self.rightKeyTimer del self.leftKeyTimer @@ -731,7 +738,10 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def pauseEntry(self): self.pauseService() - self.show() + if self.seekstate == self.SEEK_STATE_PAUSE: + self.show() + else: + self.hide() def stopEntry(self): self.playlist.stopFile() @@ -838,7 +848,8 @@ def filescan(**kwargs): )] try: from Plugins.Extensions.CDInfo.plugin import Query - mediatypes.insert(0,Scanner(mimetypes = ["audio/x-cda", "audio/x-wav"], + mediatypes.append( + Scanner(mimetypes = ["audio/x-cda"], paths_to_scan = [ ScanPath(path = "", with_subdirs = False),