X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa14114f1c17459de0aa31a0268224c4b959e2a8..3a9a9d2a3eb9cb382b1ccaa978c532d2423dfe73:/lib/python/Screens/MediaPlayer.py

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 43658c8f..bab3e0aa 100644
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -10,7 +10,7 @@ from Components.Label import Label
 from Components.FileList import FileEntryComponent, FileList
 from Components.MediaPlayer import PlayList, PlaylistEntryComponent
 from Plugins.Plugin import PluginDescriptor
-from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG
+from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG, SCOPE_SKIN_IMAGE
 from Components.ServicePosition import ServicePositionGauge
 from Screens.ChoiceBox import ChoiceBox
 from Components.ServiceEventTracker import ServiceEventTracker
@@ -30,9 +30,9 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.playlistparsers = {}
 		self.addPlaylistParser(PlaylistIOM3U, "m3u")
 		self.addPlaylistParser(PlaylistIOPLS, "pls")
-		self.addPlaylistParser(PlaylistIOInternal, "e2")
+		self.addPlaylistParser(PlaylistIOInternal, "e2pls")
 
-		self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2)", useServiceRef = True)
+		self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True)
 		self["filelist"] = self.filelist
 
 		self.playlist = PlayList()
@@ -52,6 +52,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self["year"] = Label("")
 		self["genretext"] = Label(_("Genre:"))
 		self["genre"] = Label("")
+		self["coverArt"] = Pixmap()
 		
 		#self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
 
@@ -129,9 +130,11 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.infoTimer.start(500)
 		
 		self.currList = "filelist"
+
+		self.coverArtFileName = ""
 		
 		self.playlistIOInternal = PlaylistIOInternal()
-		list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2"))
+		list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
 		if list:
 			for x in list:
 				self.playlist.addFile(x.ref)
@@ -144,7 +147,7 @@ class MediaPlayer(Screen, InfoBarSeek):
 		self.playlistIOInternal.clear()
 		for x in self.playlist.list:
 			self.playlistIOInternal.addService(ServiceReference(x[0]))
-		self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2"))
+		self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
 		self.close()
 	
 	def checkSkipShowHideLock(self):
@@ -169,8 +172,10 @@ class MediaPlayer(Screen, InfoBarSeek):
 										 album = currPlay.info().getInfoString(iServiceInformation.sAlbum),
 										 genre = currPlay.info().getInfoString(iServiceInformation.sGenre),
 										 clear = True)
+			self.updateCoverArtPixmap( currPlay.info().getName() )
 		else:
 			self.updateMusicInformation()
+			self.updateCoverArtPixmap( "" )
 	
 	def updateMusicInformation(self, artist = "", title = "", album = "", year = "", genre = "", clear = False):
 		self.updateSingleMusicInformation("artist", artist, clear)
@@ -184,6 +189,19 @@ class MediaPlayer(Screen, InfoBarSeek):
 			if self[name].getText() != info:
 				self[name].setText(info)
 
+	def updateCoverArtPixmap(self, currentServiceName):
+		filename = currentServiceName
+		# The "getName" usually adds something like "MP3 File:" infront of filename
+		# Get rid of this...by finding the first "/"
+		filename = filename[filename.find("/"):]
+		path = os.path.dirname(filename)
+		pngname = path + "/" + "folder.png"
+		if not os.path.exists(pngname):
+			pngname = resolveFilename(SCOPE_SKIN_IMAGE, "no_coverArt.png")
+		if self.coverArtFileName != pngname:
+			self.coverArtFileName = pngname
+			self["coverArt"].instance.setPixmapFromFile(self.coverArtFileName)
+
 	def fwdTimerFire(self):
 		self.fwdKeyTimer.stop()
 		self.fwdtimer = False