always utf8 for radiotext
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Wed, 11 Oct 2006 14:14:59 +0000 (14:14 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Wed, 11 Oct 2006 14:14:59 +0000 (14:14 +0000)
data/skin.xml
data/skin_default.xml
lib/python/Components/Converter/RadioText.py

index 86e593b..2f6027c 100644 (file)
@@ -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">RadioText-UTF8</convert>
+                               <convert type="RadioText">RadioText</convert>
                        </widget>
 
                        <ePixmap position="0,50" zPosition="-1" size="720,148" pixmap="info-bg.png" />
index 6e93138..87a1d57 100644 (file)
                <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">RadioText-UTF8</convert>
+                       <convert type="RadioText">RadioText</convert>
                </widget>
        </screen>
        <screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1">
index c47e02f..59885c0 100644 (file)
@@ -9,11 +9,9 @@ class RadioText(Converter, object):
        @cached
        def getText(self):
                rt = self.source.radiotext
-               if rt is None:
-                       return ""
-               text = rt.getRadioText()
-               if self.type == "RadioText-UTF8":
-                       return text.decode("latin-1").encode("utf-8")
-               else:
-                       return text
+               text = ""
+               if rt:
+                       if self.type == "RadioText":
+                               text = rt.getRadioText()
+               return text.decode("latin-1").encode("utf-8")
        text = property(getText)