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 8e6b721c7755e4b55442c3838b1bb4c1ccb9f374..51dc09a5a549e0114cfe84d03781311c00555014 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -2,19 +2,29 @@
 ## Picon renderer by Gruffy .. some speedups by Ghost
 ##
 from Renderer import Renderer
-from enigma import ePixmap
-from Tools.Directories import pathExists, fileExists, SCOPE_SKIN_IMAGE, resolveFilename
+from enigma import ePixmap, eEnv
+from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, SCOPE_CURRENT_SKIN, resolveFilename
 
 class Picon(Renderer):
-       pngname = ""
-       nameCache = { }
-       searchPaths = ['/etc/picon/',
-                               '/media/cf/picon/',
-                               '/media/usb/picon/',
-                               '/media/hdd/picon/']
+       searchPaths = (eEnv.resolve('${datadir}/enigma2/%s/'),
+                               '/media/cf/%s/',
+                               '/media/usb/%s/')
 
        def __init__(self):
                Renderer.__init__(self)
+               self.path = "picon"
+               self.nameCache = { }
+               self.pngname = ""
+
+       def applySkin(self, desktop, parent):
+               attribs = [ ]
+               for (attrib, value) in self.skinAttributes:
+                       if attrib == "path":
+                               self.path = value
+                       else:
+                               attribs.append((attrib,value))
+               self.skinAttributes = attribs
+               return Renderer.applySkin(self, desktop, parent)
 
        GUI_WIDGET = ePixmap
 
@@ -26,7 +36,7 @@ class Picon(Renderer):
                                # strip all after last :
                                pos = sname.rfind(':')
                                if pos != -1:
-                                       sname = sname[:pos].rstrip(':')
+                                       sname = sname[:pos].rstrip(':').replace(':','_')
                                pngname = self.nameCache.get(sname, "")
                                if pngname == "":
                                        pngname = self.findPicon(sname)
@@ -36,8 +46,12 @@ class Picon(Renderer):
                                pngname = self.nameCache.get("default", "")
                                if pngname == "": # no default yet in cache..
                                        pngname = self.findPicon("picon_default")
-                                       if pngname == "": # Fallback to enigma2 logo
-                                               pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
+                                       if pngname == "":
+                                               tmp = resolveFilename(SCOPE_CURRENT_SKIN, "picon_default.png")
+                                               if fileExists(tmp):
+                                                       pngname = tmp
+                                               else:
+                                                       pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/picon_default.png")
                                        self.nameCache["default"] = pngname
                        if self.pngname != pngname:
                                self.instance.setPixmapFromFile(pngname)
@@ -45,7 +59,7 @@ class Picon(Renderer):
 
        def findPicon(self, serviceName):
                for path in self.searchPaths:
-                       pngname = path + serviceName + ".png"
+                       pngname = (path % self.path) + serviceName + ".png"
                        if fileExists(pngname):
                                return pngname
                return ""