diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/Sources/RadioText.py | 10 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/PicturePlayer/plugin.py | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/python/Components/Sources/RadioText.py b/lib/python/Components/Sources/RadioText.py index de10ad81..21a3f1aa 100644 --- a/lib/python/Components/Sources/RadioText.py +++ b/lib/python/Components/Sources/RadioText.py @@ -3,22 +3,24 @@ from Components.Element import cached from enigma import iPlayableService from Source import Source -class RadioText(PerServiceBase, Source, object): +class RdsDecoder(PerServiceBase, Source, object): def __init__(self, navcore): Source.__init__(self) PerServiceBase.__init__(self, navcore, { iPlayableService.evStart: self.gotEvent, iPlayableService.evUpdatedRadioText: self.gotEvent, + iPlayableService.evUpdatedRtpText: self.gotEvent, + iPlayableService.evUpdatedRassInteractivePicMask: self.gotEvent, iPlayableService.evEnd: self.gotEvent }, with_event=True) @cached - def getText(self): + def getDecoder(self): service = self.navcore.getCurrentService() - return service and service.radioText() + return service and service.rdsDecoder() - radiotext = property(getText) + decoder = property(getDecoder) def gotEvent(self, what): if what in [iPlayableService.evStart, iPlayableService.evEnd]: diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py index 34e8c10f..23c250ef 100644 --- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py +++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py @@ -158,7 +158,7 @@ class ThumbView(Screen): ptr = loadPic(self.path + self.thumblist[self.thumbindex], 180, 160, self.aspect, int(config.pic.resize.value), int(config.pic.rotate.value),1, cachefile) if ptr != None: self["thumb"+str(self.thumbindex)].show() - self["thumb"+str(self.thumbindex)].instance.setPixmap(ptr.__deref__()) + self["thumb"+str(self.thumbindex)].instance.setPixmap(ptr) self.thumbindex += 1 if self.thumbindex < 6: @@ -297,7 +297,7 @@ class PicView(Screen): if self.currPic != None: self.old = self.index self["file"].setText(self.list[self.old][0] + " (" + str(self.old+1) + "/" + str(self.maxentry+1) + ")") - self["picture"].instance.setPixmap(self.currPic.__deref__()) + self["picture"].instance.setPixmap(self.currPic) self.next() self["point"].show() @@ -489,7 +489,7 @@ class picmain(Screen): ptr = loadPic(self.filelist.getCurrentDirectory() + self.filelist.getFilename(), 180, 160, self.aspect, int(config.pic.resize.value), 0, 0, cachefile) if ptr != None: self["thumbnail"].show() - self["thumbnail"].instance.setPixmap(ptr.__deref__()) + self["thumbnail"].instance.setPixmap(ptr) else: self["thumbnail"].hide() |