X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2a8ecd871020fdd668cf5500460e5a6e7851b4b0..7f399d23032b1e6d39123db87bdfa98a778c9ffd:/lib/python/Plugins/Extensions/MediaPlayer/plugin.py

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index dcc601fd..942dc919 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -12,7 +12,7 @@ from Components.FileList import FileList
 from Components.MediaPlayer import PlayList
 from Tools.Directories import resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE
 from Components.ServicePosition import ServicePositionGauge
-from Components.ServiceEventTracker import ServiceEventTracker
+from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
 from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications
 from ServiceReference import ServiceReference
@@ -31,7 +31,7 @@ class MyPlayList(PlayList):
 		self.oldCurrPlaying = -1
 
 class MediaPixmap(Pixmap):
-	def applySkin(self, desktop):
+	def applySkin(self, desktop, screen):
 		self.default_pixmap = None
 		if self.skinAttributes is not None:
 			for (attrib, value) in self.skinAttributes:
@@ -40,9 +40,9 @@ class MediaPixmap(Pixmap):
 					break
 		if self.default_pixmap is None:
 			self.default_pixmap = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/no_coverArt.png")
-		return Pixmap.applySkin(self, desktop)
+		return Pixmap.applySkin(self, desktop, screen)
 
-class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, HelpableScreen):
+class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, HelpableScreen):
 	ALLOW_SUSPEND = True
 	ENABLE_RESUME_SUPPORT = True
 
@@ -51,6 +51,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup
 		InfoBarAudioSelection.__init__(self)
 		InfoBarCueSheetSupport.__init__(self, actionmap = "MediaPlayerCueSheetActions")
 		InfoBarNotifications.__init__(self)
+		InfoBarBase.__init__(self)
 		HelpableScreen.__init__(self)
 		self.summary = None
 		self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
@@ -62,7 +63,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup
 		self.addPlaylistParser(PlaylistIOInternal, "e2pls")
 
 		# 'None' is magic to start at the list of mountpoints
-		self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True)
+		self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
 		self["filelist"] = self.filelist
 
 		self.playlist = MyPlayList()
@@ -531,7 +532,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup
 
 	def copyDirectory(self, directory, recursive = True):
 		print "copyDirectory", directory
-		filelist = FileList(directory, useServiceRef = True, isTop = True)
+		filelist = FileList(directory, useServiceRef = True)
 
 		for x in filelist.getFileList():
 			if x[0][1] == True: #isDir
@@ -727,7 +728,7 @@ class MediaPlayerLCDScreen(Screen):
 			self["text4"].setText(text)
 
 def main(session, **kwargs):
-        session.open(MediaPlayer)
+	session.open(MediaPlayer)
 
 def menu(menuid, **kwargs):
 	if menuid == "mainmenu":