stop update length timer when a movie was selected

[enigma2.git] / lib / python / Screens / MediaPlayer.py

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index d2f3c0894896e80b02684532d02a991de89719c2..fe1e0a8fd857dbece1c25f3618187df5031b8b89 100644 (file)
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -21,9 +21,10 @@ import os
 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()
@@ -49,7 +50,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
                {
                        "ok": self.ok,
-                       "cancel": self.close,
+                       "cancel": self.exit,
                        
                        "right": self.rightDown,
                        "rightRepeated": self.doNothing,
@@ -115,6 +116,9 @@ class MediaPlayer(Screen, InfoBarSeek):
        def doNothing(self):
                pass
        
+       def exit(self):
+               self.close()
+       
        def checkSkipShowHideLock(self):
                self.updatedSeekState()
        
@@ -122,7 +126,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                self.nextEntry()
                
        def __onClose(self):
-               self.session.nav.playService(None)
+               self.session.nav.playService(self.oldService)
        
        def delMPTimer(self):
                del self.rightKeyTimer
@@ -284,7 +288,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                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