servicemp3.cpp: more simple/flexible streaming detection

[enigma2.git] / lib / python / Components / Renderer / Picon.py

diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index ca934c8e8acaab098054e1300c3b6491395ce904..51dc09a5a549e0114cfe84d03781311c00555014 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -2,13 +2,13 @@
 ## Picon renderer by Gruffy .. some speedups by Ghost
 ##
 from Renderer import Renderer
-from enigma import ePixmap
+from enigma import ePixmap, eEnv
 from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, SCOPE_CURRENT_SKIN, resolveFilename
 
 class Picon(Renderer):
-       searchPaths = ['/usr/share/enigma2/%s/',
+       searchPaths = (eEnv.resolve('${datadir}/enigma2/%s/'),
                                '/media/cf/%s/',
-                               '/media/usb/%s/']
+                               '/media/usb/%s/')
 
        def __init__(self):
                Renderer.__init__(self)
@@ -16,7 +16,7 @@ class Picon(Renderer):
                self.nameCache = { }
                self.pngname = ""
 
-       def applySkin(self, desktop):
+       def applySkin(self, desktop, parent):
                attribs = [ ]
                for (attrib, value) in self.skinAttributes:
                        if attrib == "path":
@@ -24,7 +24,7 @@ class Picon(Renderer):
                        else:
                                attribs.append((attrib,value))
                self.skinAttributes = attribs
-               return Renderer.applySkin(self, desktop)
+               return Renderer.applySkin(self, desktop, parent)
 
        GUI_WIDGET = ePixmap