From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 24 Mar 2006 08:24:35 +0000 (+0000)
Subject: playing next entry after EOF should work now in the media player
X-Git-Tag: 2.6.0~3770
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/3b90c686f9c7821d8567dc5725ad1565d59e9a89?ds=sidebyside

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 95ff16aa..9b06d1f4 100644
--- 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)