diff options
Diffstat (limited to 'lib/python')
36 files changed, 73 insertions, 55 deletions
diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py index ddd6ffb1..338101ef 100644 --- a/lib/python/Components/Clock.py +++ b/lib/python/Components/Clock.py @@ -14,7 +14,7 @@ class Clock(VariableText, HTMLComponent, GUIComponent): self.doClock() self.clockTimer = eTimer() - self.clockTimer.timeout.get().append(self.doClock) + self.clockTimer.callback.append(self.doClock) def onShow(self): self.doClock() diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py index f4b99837..192813f5 100644 --- a/lib/python/Components/ConditionalWidget.py +++ b/lib/python/Components/ConditionalWidget.py @@ -9,7 +9,7 @@ class ConditionalWidget(GUIComponent): if (withTimer): self.conditionCheckTimer = eTimer() - self.conditionCheckTimer.timeout.get().append(self.update) + self.conditionCheckTimer.callback.append(self.update) self.conditionCheckTimer.start(1000) def postWidgetCreate(self, instance): @@ -38,7 +38,7 @@ class BlinkingWidget(GUIComponent): self.blinking = False self.setBlinkTime(500) self.timer = eTimer() - self.timer.timeout.get().append(self.blink) + self.timer.callback.append(self.blink) def setBlinkTime(self, time): self.blinktime = time diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py index f42d6a96..d1b295ba 100644 --- a/lib/python/Components/ConfigList.py +++ b/lib/python/Components/ConfigList.py @@ -19,7 +19,7 @@ class ConfigList(HTMLComponent, GUIComponent, object): def execBegin(self): rcinput = eRCInput.getInstance() rcinput.setKeyboardMode(rcinput.kmAscii) - self.timer.timeout.get().append(self.timeout) + self.timer.callback.append(self.timeout) def execEnd(self): rcinput = eRCInput.getInstance() diff --git a/lib/python/Components/Converter/ConditionalShowHide.py b/lib/python/Components/Converter/ConditionalShowHide.py index 50e8b1a8..f5ec7039 100644 --- a/lib/python/Components/Converter/ConditionalShowHide.py +++ b/lib/python/Components/Converter/ConditionalShowHide.py @@ -10,8 +10,8 @@ class ConditionalShowHide(Converter, object): if self.blink: self.blinktime = 500 self.timer = eTimer() - self.timer.timeout.get().append(self.blinkFunc) - else: + self.timer.callback.append(self.blinkFunc) + else self.timer = None def blinkFunc(self): diff --git a/lib/python/Components/Converter/Poll.py b/lib/python/Components/Converter/Poll.py index f41765d4..33b9f305 100644 --- a/lib/python/Components/Converter/Poll.py +++ b/lib/python/Components/Converter/Poll.py @@ -3,7 +3,7 @@ from enigma import eTimer class Poll(object): def __init__(self): self.__poll_timer = eTimer() - self.__poll_timer.timeout.get().append(self.poll) + self.__poll_timer.callback.append(self.poll) self.__interval = 1000 self.__enabled = False diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py index 6e02cce9..2d0a71e7 100644 --- a/lib/python/Components/PerServiceDisplay.py +++ b/lib/python/Components/PerServiceDisplay.py @@ -11,7 +11,7 @@ class PerServiceBase(object): self.navcore = navcore self.navcore.event.append(self.event_callback) self.poll_timer = eTimer() - self.poll_timer.timeout.get().append(self.poll) + self.poll_timer.callback.append(self.poll) self.with_event = with_event # start with stopped state, so simulate that diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py index 3cc8c661..f6ecaf0c 100644 --- a/lib/python/Components/Pixmap.py +++ b/lib/python/Components/Pixmap.py @@ -24,7 +24,7 @@ class MovingPixmap(Pixmap): self.clearPath() self.moveTimer = eTimer() - self.moveTimer.timeout.get().append(self.doMove) + self.moveTimer.callback.append(self.doMove) def clearPath(self, repeated = False): if (self.moving): diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py index 6f7082d5..985f8841 100644 --- a/lib/python/Components/ServicePosition.py +++ b/lib/python/Components/ServicePosition.py @@ -12,7 +12,7 @@ class ServicePosition(PerServiceDisplay, object): def __init__(self, navcore, type): object.__init__(self) self.updateTimer = eTimer() - self.updateTimer.timeout.get().append(self.update) + self.updateTimer.callback.append(self.update) PerServiceDisplay.__init__(self, navcore, { iPlayableService.evStart: self.newService, diff --git a/lib/python/Components/Sources/Boolean.py b/lib/python/Components/Sources/Boolean.py index 21c2c2b9..97b92bc6 100644 --- a/lib/python/Components/Sources/Boolean.py +++ b/lib/python/Components/Sources/Boolean.py @@ -16,7 +16,7 @@ class Boolean(Source, object): self.fixed = fixed if poll > 0: self.poll_timer = eTimer() - self.poll_timer.timeout.get().append(self.poll) + self.poll_timer.callback.append(self.poll) self.poll_timer.start(poll) else: self.poll_timer = None diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py index b59a20d5..60fa7ac2 100644 --- a/lib/python/Components/Sources/Clock.py +++ b/lib/python/Components/Sources/Clock.py @@ -8,7 +8,7 @@ class Clock(Source): def __init__(self): Source.__init__(self) self.clock_timer = eTimer() - self.clock_timer.timeout.get().append(self.poll) + self.clock_timer.callback.append(self.poll) self.clock_timer.start(1000) @cached diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py index 4d38f754..141bd8a4 100644 --- a/lib/python/Components/Sources/FrontendStatus.py +++ b/lib/python/Components/Sources/FrontendStatus.py @@ -9,7 +9,7 @@ class FrontendStatus(Source): self.frontend_source = frontend_source self.invalidate() self.poll_timer = eTimer() - self.poll_timer.timeout.get().append(self.updateFrontendStatus) + self.poll_timer.callback.append(self.updateFrontendStatus) self.poll_timer.start(update_interval) def invalidate(self): diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py index 4f31fa46..80a07df4 100644 --- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py +++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py @@ -380,7 +380,7 @@ class GraphMultiEPG(Screen): },-1) self.updateTimelineTimer = eTimer() - self.updateTimelineTimer.timeout.get().append(self.moveTimeLines) + self.updateTimelineTimer.callback.append(self.moveTimeLines) self.updateTimelineTimer.start(60*1000) self.onLayoutFinish.append(self.onCreate) diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 63e2b302..03d76173 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -159,11 +159,11 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup self.righttimer = False self.rightKeyTimer = eTimer() - self.rightKeyTimer.timeout.get().append(self.rightTimerFire) + self.rightKeyTimer.callback.append(self.rightTimerFire) self.lefttimer = False self.leftKeyTimer = eTimer() - self.leftKeyTimer.timeout.get().append(self.leftTimerFire) + self.leftKeyTimer.callback.append(self.leftTimerFire) self.currList = "filelist" diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py index b305b653..6d41305e 100644 --- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py +++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py @@ -94,7 +94,7 @@ class ThumbView(Screen): self["label0"].setText(_("no Picture found")) self.ThumbTimer = eTimer() - self.ThumbTimer.timeout.get().append(self.showThumb) + self.ThumbTimer.callback.append(self.showThumb) self.fillPage() @@ -244,11 +244,11 @@ class PicView(Screen): self["pause"] = Pixmap() self.decodeTimer = eTimer() - self.decodeTimer.timeout.get().append(self.decodePic) + self.decodeTimer.callback.append(self.decodePic) self.decodeTimer.start(300, True) self.slideTimer = eTimer() - self.slideTimer.timeout.get().append(self.slidePic) + self.slideTimer.callback.append(self.slidePic) def Pause(self): @@ -457,7 +457,7 @@ class picmain(Screen): self["thumbnail"] = Pixmap() self.ThumbTimer = eTimer() - self.ThumbTimer.timeout.get().append(self.showThumb) + self.ThumbTimer.callback.append(self.showThumb) self.ThumbTimer.start(500, True) def up(self): diff --git a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py index b5218358..3c96dd44 100644 --- a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py +++ b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py @@ -139,7 +139,7 @@ class RSSPoller: def __init__(self): self.poll_timer = eTimer() - self.poll_timer.timeout.get().append(self.poll) + self.poll_timer.callback.append(self.poll) self.poll_timer.start(0, 1) self.last_links = Set() self.dialog = None diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py index 17abb0ff..c7216382 100644 --- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py @@ -30,7 +30,7 @@ class Upgrade(Screen): self.update = True self.delayTimer = eTimer() - self.delayTimer.timeout.get().append(self.doUpdateDelay) + self.delayTimer.callback.append(self.doUpdateDelay) def go(self): if self.update: diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index e394db4b..1f222046 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -123,7 +123,7 @@ class PositionerSetup(Screen): self.updateColors("tune") self.statusTimer = eTimer() - self.statusTimer.timeout.get().append(self.updateStatus) + self.statusTimer.callback.append(self.updateStatus) self.statusTimer.start(50, False) def restartPrevService(self, yesno): diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py index c0fbe740..8127514c 100644 --- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py @@ -268,7 +268,7 @@ class UpdatePlugin(Screen): self.activity = 0 self.activityTimer = eTimer() - self.activityTimer.timeout.get().append(self.doActivityTimer) + self.activityTimer.callback.append(self.doActivityTimer) self.activityTimer.start(100, False) self.ipkg = IpkgComponent() diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py index c6d6b864..9defb9eb 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py @@ -66,7 +66,7 @@ class VideoHardware: # until we have the hotplug poll socket # self.timer = eTimer() -# self.timer.timeout.get().append(self.readPreferredModes) +# self.timer.callback.append(self.readPreferredModes) # self.timer.start(1000) def readAvailableModes(self): diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index e1402aea..d640ac25 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -1,28 +1,39 @@ +from Tools.Profile import profile + from Screen import Screen from Components.Button import Button from Components.ServiceList import ServiceList from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap from Components.MenuList import MenuList from Components.ServiceEventTracker import ServiceEventTracker +profile("ChannelSelection.py 1") from EpgSelection import EPGSelection from enigma import eServiceReference, eEPGCache, eServiceCenter, eRCInput, eTimer, eDVBDB, iPlayableService, iServiceInformation, getPrevAsciiCode from Components.config import config, ConfigSubsection, ConfigText from Tools.NumericalTextInput import NumericalTextInput +profile("ChannelSelection.py 2") from Components.NimManager import nimmanager +profile("ChannelSelection.py 2.1") from Components.Sources.Source import ObsoleteSource +profile("ChannelSelection.py 2.2") from Components.Sources.RdsDecoder import RdsDecoder +profile("ChannelSelection.py 2.3") from Components.Sources.ServiceEvent import ServiceEvent +profile("ChannelSelection.py 2.4") from Components.Input import Input +profile("ChannelSelection.py 3") from Components.ParentalControl import parentalControl from Components.Pixmap import Pixmap from Screens.InputBox import InputBox, PinInput from Screens.MessageBox import MessageBox from Screens.ServiceInfo import ServiceInfo +profile("ChannelSelection.py 4") from Screens.RdsDisplay import RassInteractive from ServiceReference import ServiceReference from Tools.BoundFunction import boundFunction from re import compile from os import remove +profile("ChannelSelection.py after imports") FLAG_SERVICE_NEW_FOUND = 64 #define in lib/dvb/idvb.h as dxNewFound = 64 @@ -276,7 +287,7 @@ class SelectionEventInfo: self["ServiceEvent"] = ServiceEvent() self.servicelist.connectSelChanged(self.__selectionChanged) self.timer = eTimer() - self.timer.timeout.get().append(self.updateEventInfo) + self.timer.callback.append(self.updateEventInfo) self.onShown.append(self.__selectionChanged) def __selectionChanged(self): @@ -1081,7 +1092,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect }) self.lastChannelRootTimer = eTimer() - self.lastChannelRootTimer.timeout.get().append(self.__onCreate) + self.lastChannelRootTimer.callback.append(self.__onCreate) self.lastChannelRootTimer.start(100,True) self.history_tv = [ ] diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index 10423ada..5028301e 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -29,7 +29,7 @@ class MMIDialog(Screen): self.slotid = slotid self.timer = eTimer() - self.timer.timeout.get().append(self.keyCancel) + self.timer.callback.append(self.keyCancel) #else the skins fails self["title"] = Label("") diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py index 7746b135..1bb3d0b1 100644 --- a/lib/python/Screens/EventView.py +++ b/lib/python/Screens/EventView.py @@ -22,7 +22,7 @@ class EventViewBase: self["key_red"] = Button("") if similarEPGCB is not None: self.SimilarBroadcastTimer = eTimer() - self.SimilarBroadcastTimer.timeout.get().append(self.getSimilarEvents) + self.SimilarBroadcastTimer.callback.append(self.getSimilarEvents) else: self.SimilarBroadcastTimer = None if self.isRecording: diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py index 1578fae1..19a674ec 100644 --- a/lib/python/Screens/HarddiskSetup.py +++ b/lib/python/Screens/HarddiskSetup.py @@ -24,10 +24,10 @@ class HarddiskWait(Screen): self.timer = eTimer() if type == HarddiskSetup.HARDDISK_INITIALIZE: text = _("Initializing Harddisk...") - self.timer.timeout.get().append(self.doInit) + self.timer.callback.append(self.doInit) else: text = _("Checking Filesystem...") - self.timer.timeout.get().append(self.doCheck) + self.timer.callback.append(self.doCheck) self["wait"] = Label(text) self.timer.start(100) diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 228ca4ef..80b4239e 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -2,19 +2,16 @@ from Tools.Profile import profile, profile_final from Screen import Screen -profile("LOAD:MovieSelection") -from Screens.MovieSelection import MovieSelection +profile("LOAD:enigma") +from enigma import iPlayableService + profile("LOAD:ChannelSelectionRadio") from Screens.ChannelSelection import ChannelSelectionRadio +profile("LOAD:MovieSelection") +from Screens.MovieSelection import MovieSelection profile("LOAD:ChoiceBox") from Screens.ChoiceBox import ChoiceBox -profile("LOAD:InitBar_Components") -from Components.Sources.Source import ObsoleteSource -from Components.ActionMap import HelpableActionMap -from Components.config import config -from Components.ServiceEventTracker import ServiceEventTracker - profile("LOAD:InfoBarGenerics") from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ @@ -25,12 +22,15 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport +profile("LOAD:InitBar_Components") +from Components.Sources.Source import ObsoleteSource +from Components.ActionMap import HelpableActionMap +from Components.config import config +from Components.ServiceEventTracker import ServiceEventTracker + profile("LOAD:HelpableScreen") from Screens.HelpMenu import HelpableScreen -profile("LOAD:enigma") -from enigma import iPlayableService - class InfoBar(InfoBarShowHide, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 28e619fd..b62a466b 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -71,7 +71,7 @@ class InfoBarShowHide: self.__locked = 0 self.hideTimer = eTimer() - self.hideTimer.timeout.get().append(self.doTimerHide) + self.hideTimer.callback.append(self.doTimerHide) self.hideTimer.start(5000, True) self.onShow.append(self.__onShow) @@ -171,7 +171,7 @@ class NumberZap(Screen): }) self.Timer = eTimer() - self.Timer.timeout.get().append(self.keyOK) + self.Timer.callback.append(self.keyOK) self.Timer.start(3000, True) class InfoBarNumberZap: @@ -1018,7 +1018,7 @@ class InfoBarTimeshift: self.timeshift_enabled = 0 self.timeshift_state = 0 self.ts_rewind_timer = eTimer() - self.ts_rewind_timer.timeout.get().append(self.rewindService) + self.ts_rewind_timer.callback.append(self.rewindService) self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { diff --git a/lib/python/Screens/Ipkg.py b/lib/python/Screens/Ipkg.py index 216cf8c8..eac03479 100644 --- a/lib/python/Screens/Ipkg.py +++ b/lib/python/Screens/Ipkg.py @@ -28,7 +28,7 @@ class Ipkg(Screen): self.activity = 0 self.activityTimer = eTimer() - self.activityTimer.timeout.get().append(self.doActivityTimer) + self.activityTimer.callback.append(self.doActivityTimer) #self.activityTimer.start(100, False) self.ipkg = IpkgComponent() diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py index df276670..51f39877 100644 --- a/lib/python/Screens/MessageBox.py +++ b/lib/python/Screens/MessageBox.py @@ -61,7 +61,7 @@ class MessageBox(Screen): self.timeout = timeout if timeout > 0: self.timer = eTimer() - self.timer.timeout.get().append(self.timerTick) + self.timer.callback.append(self.timerTick) self.onExecBegin.append(self.startTimer) self.origTitle = None if self.execing: diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py index e0bd4ab3..8fb1eb80 100644 --- a/lib/python/Screens/MovieSelection.py +++ b/lib/python/Screens/MovieSelection.py @@ -129,7 +129,7 @@ class SelectionEventInfo: self["Service"] = ServiceEvent() self.list.connectSelChanged(self.__selectionChanged) self.timer = eTimer() - self.timer.timeout.get().append(self.updateEventInfo) + self.timer.callback.append(self.updateEventInfo) self.onShown.append(self.__selectionChanged) def __selectionChanged(self): @@ -156,7 +156,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo): self.bouquet_mark_edit = False self.delayTimer = eTimer() - self.delayTimer.timeout.get().append(self.updateHDDData) + self.delayTimer.callback.append(self.updateHDDData) self["waitingtext"] = Label(_("Please wait... Loading list...")) diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py index f5f48e25..6ae12cae 100644 --- a/lib/python/Screens/ParentalControlSetup.py +++ b/lib/python/Screens/ParentalControlSetup.py @@ -148,7 +148,7 @@ class ParentalControlEditor(Screen): self.currentLetter = chr(SPECIAL_CHAR) self.readServiceList() self.chooseLetterTimer = eTimer() - self.chooseLetterTimer.timeout.get().append(self.chooseLetter) + self.chooseLetterTimer.callback.append(self.chooseLetter) self.onLayoutFinish.append(self.LayoutFinished) self["actions"] = NumberActionMap(["DirectionActions", "ColorActions", "OkCancelActions", "NumberActions"], diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 2a8c3df7..3e71912b 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -298,7 +298,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): }, -2) self.statusTimer = eTimer() - self.statusTimer.timeout.get().append(self.updateStatus) + self.statusTimer.callback.append(self.updateStatus) #self.statusTimer.start(5000, True) self.list = [] diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py index c0988868..448b4b44 100644 --- a/lib/python/Screens/SubservicesQuickzap.py +++ b/lib/python/Screens/SubservicesQuickzap.py @@ -23,7 +23,7 @@ class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, Info self.currentlyPlayingSubservice = 0 self.timer = eTimer() - self.timer.timeout.get().append(self.playSubservice) + self.timer.callback.append(self.playSubservice) self.onLayoutFinish.append(self.onLayoutFinished) self["actions"] = NumberActionMap( [ "InfobarSubserviceQuickzapActions", "NumberActions", "DirectionActions", "ColorActions" ], diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 1b133152..c987ac61 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -162,7 +162,7 @@ class Wizard(Screen, HelpableScreen): self.currStep = 1 self.timeoutTimer = eTimer() - self.timeoutTimer.timeout.get().append(self.timeoutCounterFired) + self.timeoutTimer.callback.append(self.timeoutCounterFired) self["text"] = Label() diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py index 2cbc0f4f..696b8e20 100644 --- a/lib/python/Tools/NumericalTextInput.py +++ b/lib/python/Tools/NumericalTextInput.py @@ -56,7 +56,7 @@ class NumericalTextInput: if handleTimeout: self.timer = eTimer() - self.timer.timeout.get().append(self.timeout) + self.timer.callback.append(self.timeout) else: self.timer = None self.lastKey = -1 diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 06d74355..e3b4cd20 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -135,7 +135,6 @@ typedef long time_t; %include <lib/base/object.h> %include <lib/base/eerror.h> -%immutable eTimer::timeout; %immutable eSocketNotifier::activated; %include <lib/base/ebase.h> %include <lib/base/smartptr.h> diff --git a/lib/python/python.cpp b/lib/python/python.cpp index 84716e72..ad029fb6 100644 --- a/lib/python/python.cpp +++ b/lib/python/python.cpp @@ -3,6 +3,7 @@ #undef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200112L extern "C" void init_enigma(); +extern "C" void eBaseInit(void); extern void bsodFatal(); #define SKIP_PART2 @@ -124,6 +125,7 @@ ePython::ePython() PyEval_InitThreads(); init_enigma(); + eBaseInit(); } ePython::~ePython() diff --git a/lib/python/python.h b/lib/python/python.h index 76f6aa88..9edc50ad 100644 --- a/lib/python/python.h +++ b/lib/python/python.h @@ -314,10 +314,16 @@ inline ePyObject Impl_PyTuple_GET_ITEM(ePyObject list, unsigned int pos) } #endif +inline void Impl_INCREF(PyObject *ob) +{ + Py_INCREF(ob); +} + inline void Impl_DECREF(PyObject *ob) { Py_DECREF(ob); } +#define Org_Py_INCREF(obj) Impl_INCREF(obj) #define Org_Py_DECREF(obj) Impl_DECREF(obj) #undef Py_DECREF #undef Py_XDECREF |