convert radiotext to utf8

diff --git a/data/skin.xml b/data/skin.xml
index eb690a9..86e593b 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -64,7 +64,7 @@
                <screen name="InfoBar" flags="wfNoBorder" position="0,330" size="720,198" title="InfoBar" backgroundColor="transparent" >
                        
                        <widget source="RadioText" render="Label" position="50,0" size="620,50" font="LCD;25" backgroundColor="transparent">
-                               <convert type="RadioText">Name</convert>
+                               <convert type="RadioText">RadioText-UTF8</convert>
                        </widget>
 
                        <ePixmap position="0,50" zPosition="-1" size="720,148" pixmap="info-bg.png" />

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 40eb235..6e93138 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -228,7 +228,7 @@
                <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
                <widget name="list" position="0,45" size="560,196" scrollbarMode="showOnDemand" />
                <widget source="RadioText" render="Label" position="0,241" size="560,66" font="LCD;25" >
-                       <convert type="RadioText">Name</convert>
+                       <convert type="RadioText">RadioText-UTF8</convert>
                </widget>
        </screen>
        <screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1">

diff --git a/lib/python/Components/Converter/RadioText.py b/lib/python/Components/Converter/RadioText.py
index 77ec58e..e449995 100644 (file)
--- a/lib/python/Components/Converter/RadioText.py
+++ b/lib/python/Components/Converter/RadioText.py
@@ -4,12 +4,16 @@ from Components.Element import cached
 class RadioText(Converter, object):
        def __init__(self, type):
                Converter.__init__(self, type)
+               self.type = type
 
        @cached
        def getText(self):
                rt = self.source.radiotext
                if rt is None:
                        return "N/A"
-               return rt
-
+               text = rt.getRadioText()
+               if self.type == "RadioText-UTF8":
+                       return text.decode("latin-1").encode("utf-8")
+               else:
+                       return text
        text = property(getText)

diff --git a/lib/python/Components/Sources/RadioText.py b/lib/python/Components/Sources/RadioText.py
index 6faad31..de10ad8 100644 (file)
--- a/lib/python/Components/Sources/RadioText.py
+++ b/lib/python/Components/Sources/RadioText.py
@@ -16,8 +16,7 @@ class RadioText(PerServiceBase, Source, object):
        @cached
        def getText(self):
                service = self.navcore.getCurrentService()
-               info = service and service.radioText()
-               return info and info.getRadioText()
+               return service and service.radioText()
 
        radiotext = property(getText)