playing next entry after EOF should work now in the media player

start playing when adding first entry to the playlist

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 95ff16aa2ee90402e28694184e563506358a60bd..9b06d1f4f0cb5fd1859a2347b112c0b29dcd4bbc 100644 (file)
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -44,16 +44,6 @@ class MediaPlayer(Screen, InfoBarSeek):
                self["genretext"] = Label(_("Genre:"))
                self["genre"] = Label("")
                
-               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
-                       {
-#                              iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,
-#                              iPlayableService.evStart: self.__serviceStarted,
-                               
-                               iPlayableService.evEOF: self.__evEOF,
-#                              iPlayableService.evSOF: self.__evSOF,
-                       })
-
-        
                #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
                 
                self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
@@ -96,6 +86,15 @@ class MediaPlayer(Screen, InfoBarSeek):
 
                InfoBarSeek.__init__(self)
 
+               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+                       {
+#                              iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,
+#                              iPlayableService.evStart: self.__serviceStarted,
+                               
+                               iPlayableService.evEOF: self.__evEOF,
+#                              iPlayableService.evSOF: self.__evSOF,
+                       })
+
                self.onClose.append(self.delMPTimer)
                self.onClose.append(self.__onClose)
                
@@ -257,6 +256,8 @@ class MediaPlayer(Screen, InfoBarSeek):
        def copyFile(self):
                self.playlist.addFile(self.filelist.getServiceRef())
                self.playlist.updateList()
+               if len(self.playlist) == 1:
+                       self.playEntry()
 
        def nextEntry(self):
                next = self.playlist.getCurrentIndex() + 1
@@ -280,7 +281,7 @@ class MediaPlayer(Screen, InfoBarSeek):
        
        def playEntry(self):
                currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
-               if currref is None or self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference():
+               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)