diff options
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer')
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_de.jpg | bin | 176933 -> 131540 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_en.jpg | bin | 171530 -> 128207 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_de.jpg b/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_de.jpg Binary files differindex 4396161f..41a67c24 100644..100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_de.jpg +++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_de.jpg diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_en.jpg b/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_en.jpg Binary files differindex e1d35751..6bfbbc5e 100644..100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_en.jpg +++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_en.jpg diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml b/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml index 825793f2..2f9f22bf 100644..100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml +++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml @@ -8,7 +8,7 @@ <packagename>enigma2-plugin-extensions-mediaplayer</packagename> <shortdescription>Mediaplayer plays your favorite music and videos.</shortdescription> <description>Mediaplayer plays your favorite music and videos.\nPlay all your favorite music and video files, organize them in playlists, view cover and album information.</description> - <screenshot src="http://www.dreamboxupdate.com/preview/mediaplayer_en.jpg" /> + <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediaplayer_en.jpg" /> </info> <info language="de"> <author>Dream Multimedia</author> @@ -17,7 +17,7 @@ <shortdescription>Mediaplayer spielt Ihre Musik und Videos.</shortdescription> <description>Mediaplayer spielt Ihre Musik und Videos.\nSie können all Ihre Musik- und Videodateien abspielen, in Playlisten organisieren, Cover und Albuminformationen abrufen. </description> - <screenshot src="http://www.dreamboxupdate.com/preview/mediaplayer_de.jpg" /> + <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediaplayer_de.jpg" /> </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-mediaplayer" /> 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() |
