From: kos Date: Tue, 15 Jan 2013 01:50:03 +0000 (+0900) Subject: Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into... X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=5e5249fb5503619b725d2c652a3b82a98a503075;hp=d46cbdadbe961cd1100040d67ebe54b89679ca95 Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into vuplus_experimental --- diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index f158f21..022fd45 100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -825,7 +825,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def playEntry(self): if len(self.playlist.getServiceRefList()): - audio_extensions = (".mp2", ".mp3", ".wav", ".ogg", "flac", "m4a") + audio_extensions = (".mp2", ".mp3", ".wav", ".ogg", ".flac", ".m4a", ".dts") needsInfoUpdate = False currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()] if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference(): @@ -838,7 +838,11 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB currref = self.playlist.getServiceRefList()[idx] text = self.getIdentifier(currref) text = ">"+text - ext = text[-4:].lower() + try: + import os + nameext = os.path.splitext(text) + ext = nameext[1] + except: ext = text[-4:].lower() # FIXME: the information if the service contains video (and we should hide our window) should com from the service instead if ext not in audio_extensions and not self.isAudioCD: