X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d9ee52e4f0fbe9a1ae00d0e66f9e6f0a07fa319f..e2b1235bc4885abe2dd09f0574cb56252da315e4:/mytest.py diff --git a/mytest.py b/mytest.py index 2f6cecfd..bfc015c3 100644 --- a/mytest.py +++ b/mytest.py @@ -1,18 +1,15 @@ from enigma import * +from tools import * + +import Screens.InfoBar + +import RecordTimer import sys import time -from screens import * from skin import applyGUIskin - -def CONNECT(slot, fnc): - slot.get().append(fnc) - -def DISCONNECT(slot, fnc): - slot.get().remove(fnc) - # A screen is a function which instanciates all components of a screen into a temporary component. # Thus, the global stuff is a screen, too. # In a screen, components can either be instanciated from the class-tree, cloned (copied) or @@ -22,17 +19,23 @@ def DISCONNECT(slot, fnc): # we thus have one (static) hierarchy of screens (classes, not instances) # and one with the instanciated components itself (both global and dynamic) +had = dict() + def dump(dir, p = ""): if isinstance(dir, dict): for (entry, val) in dir.items(): - dump(val, p + "/" + entry) - print p + ":" + str(dir.__class__) - -# defined components -components = {} - -# do global -doGlobal(components) + dump(val, p + "(dict)/" + entry) + if hasattr(dir, "__dict__"): + for name, value in dir.__dict__.items(): + if not had.has_key(str(value)): + had[str(value)] = 1 + dump(value, p + "/" + str(name)) + else: + print p + "/" + str(name) + ":" + str(dir.__class__) + "(cycle)" + else: + print p + ":" + str(dir) + +# + ":" + str(dir.__class__) # display @@ -63,63 +66,146 @@ class Session: self.dialogStack = [ ] def processDelay(self): - self.currentDialog.doClose() - if self.currentWindow != None: - self.currentWindow.hide() + self.execEnd() - del self.currentDialog - del self.currentWindow + if self.currentDialog.isTmp: + self.currentDialog.doClose() - if len(self.dialogStack): - (self.currentDialog, self.currentWindow) = self.dialogStack.pop() - self.currentWindow.show() - - def open(self, screen): - if self.currentDialog: - self.dialogStack.append((self.currentDialog, self.currentWindow)) - self.currentWindow.hide() + print sys.getrefcount(self.currentDialog) + del self.currentDialog.instance + dump(self.currentDialog) + del self.currentDialog - self.currentDialog = screen - screen.session = self + self.popCurrent() + + def execBegin(self): + self.currentDialog.execBegin() + self.currentDialog.instance.show() - if self.desktop != None: - self.currentWindow = wnd = eWindow(self.desktop) -# wnd.setTitle("Screen from python!") -# wnd.move(ePoint(300, 100)) -# wnd.resize(eSize(300, 300)) - - gui = GUIOutputDevice() - gui.parent = wnd - gui.create(self.currentDialog) - - applyGUIskin(self.currentDialog, wnd, None, screen.__class__.__name__) - - wnd.show() - else: - self.currentWindow = None + def execEnd(self): + self.currentDialog.execEnd() + self.currentDialog.instance.hide() + + def create(self, screen, arguments): + # creates an instance of 'screen' (which is a class) + return screen(self, *arguments) + + def instantiateDialog(self, screen, *arguments): + dlg = self.create(screen, arguments) + assert self.desktop != None + dlg.instance = eWindow(self.desktop) + + gui = GUIOutputDevice() + gui.parent = dlg.instance + gui.create(dlg) + + applyGUIskin(dlg, None, dlg.skinName, self.desktop) + + return dlg + + def pushCurrent(self): + if self.currentDialog: + self.dialogStack.append(self.currentDialog) + self.execEnd() + + def popCurrent(self): + if len(self.dialogStack): + self.currentDialog = self.dialogStack.pop() + self.execBegin() + + def execDialog(self, dialog): + self.pushCurrent() + self.currentDialog = dialog + self.currentDialog.isTmp = False + self.execBegin() + + def open(self, screen, *arguments): + self.pushCurrent() + self.currentDialog = self.instantiateDialog(screen, *arguments) + self.currentDialog.isTmp = True + self.execBegin() def keyEvent(self, code): # print "code " + str(code) if code == 32: - self.currentDialog.data["okbutton"]["instance"].push() + self.currentDialog["okbutton"].instance.push() if code == 33: - self.currentDialog.data["channelSwitcher"]["instance"].push() + self.currentDialog["channelSwitcher"].instance.push() if code >= 0x30 and code <= 0x39: try: - self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31) + self.currentDialog["menu"].instance.moveSelection(code - 0x31) except: - self.currentDialog.data["list"]["instance"].moveSelection(code - 0x31) + self.currentDialog["list"].instance.moveSelection(code - 0x31) def close(self): self.delayTimer.start(0, 1) +# TODO: remove pNavgation, eNavigation and rewrite this stuff in python. +class Navigation: + def __init__(self): + self.pnav = pNavigation() + self.pnav.m_event.get().append(self.callEvent) + self.event = [ ] + self.currentlyPlayingService = None + + self.RecordTimer = RecordTimer.RecordTimer() + + def callEvent(self, i): + for x in self.event: + x(i) + + def playService(self, ref): + self.currentlyPlayingServiceReference = None + if not self.pnav.playService(ref): + self.currentlyPlayingServiceReference = ref + return 0 + return 1 + + def getCurrentlyPlayingServiceReference(self): + return self.currentlyPlayingServiceReference + + def recordService(self, ref): + service = iRecordableServicePtr() + print "recording service: %s" % (str(ref)) + if self.pnav.recordService(ref, service): + print "record returned non-zero" + return None + else: + print "ok, recordService didn't fail" + return service + + def enqueueService(self, ref): + return self.pnav.enqueueService(ref) + + def getCurrentService(self): + service = iPlayableServicePtr() + if self.pnav.getCurrentService(service): + return None + return service + + def getPlaylist(self): + playlist = ePlaylistPtr() + if self.pnav.getPlaylist(playlist): + return None + return playlist + + def pause(self, p): + return self.pnav.pause(p) + + def recordWithTimer(self, begin, end, ref, epg): + entry = RecordTimer.RecordTimerEntry(begin, end, self, ref, epg) + self.RecordTimer.record(entry) + return entry + def runScreenTest(): session = Session() session.desktop = getDesktop() - session.open(infoBar()) + session.nav = Navigation() + + session.open(Screens.InfoBar.InfoBar) CONNECT(keyPressedSignal(), session.keyEvent) @@ -127,8 +213,29 @@ def runScreenTest(): return 0 +import keymapparser +keymapparser.readKeymap() +import skin +skin.loadSkin() # first, setup a screen runScreenTest() # now, run the mainloop + +#pt = eDebugClassPtr() +#eDebugClass.getDebug(pt, 12) +#p = pt.__deref__() +#print pt.x +#print p.x +#print "removing ptr..." +#pt = 0 +#print "now" +#print "p is " + str(p) +#print p.x +#p = 0 +# +#bla = eDebugClass() +#bla = eDebugClass(2) +# +