diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 06:47:59 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 06:47:59 +0100 |
| commit | 9c998a40679f9b630ccf8cc6fda7384ce94c30e5 (patch) | |
| tree | 6e31e148f6153232293b339ddf2e0c6328bf1e22 /lib/python/Plugins/Extensions/MediaPlayer/plugin.py | |
| parent | d6ad23c5be62bc24cc08a5c8db91f64ae2d8cf3b (diff) | |
| parent | d64e82b37efdf77b557234809d0c81857818bfac (diff) | |
| download | enigma2-9c998a40679f9b630ccf8cc6fda7384ce94c30e5.tar.gz enigma2-9c998a40679f9b630ccf8cc6fda7384ce94c30e5.zip | |
Merge branch 'bug_249_current_skin_fallback'
Conflicts:
lib/python/Components/FileList.py
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer/plugin.py')
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 98bc060c..a2422be7 100644..100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -19,7 +19,7 @@ from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS from Components.AVSwitch import AVSwitch from Components.Harddisk import harddiskmanager from Components.config import config -from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE +from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_CURRENT_SKIN from settings import MediaPlayerSettings import random @@ -50,7 +50,7 @@ class MediaPixmap(Pixmap): noCoverFile = value break if noCoverFile is None: - noCoverFile = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/no_coverArt.png") + noCoverFile = resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/no_coverArt.png") self.noCoverPixmap = LoadPixmap(noCoverFile) return Pixmap.applySkin(self, desktop, screen) @@ -110,7 +110,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB # 'None' is magic to start at the list of mountpoints defaultDir = config.mediaplayer.defaultDir.getValue() - self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") + self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() |