X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44433f650cd3e5f9f66253b74d194fcb01578595..e2b1235bc4885abe2dd09f0574cb56252da315e4:/mytest.py

diff --git a/mytest.py b/mytest.py
index 1a4b0363..bfc015c3 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,11 +1,13 @@
 from enigma import *
 from tools import *
 
+import Screens.InfoBar
+
+import RecordTimer
 
 import sys
 import time
 
-from screens import *
 from skin import applyGUIskin
 
 # A screen is a function which instanciates all components of a screen into a temporary component.
@@ -35,12 +37,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -146,13 +142,70 @@ class Session:
 	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.nav = pNavigation()
+	session.nav = Navigation()
 	
-	session.open(infoBar)
+	session.open(Screens.InfoBar.InfoBar)
 
 	CONNECT(keyPressedSignal(), session.keyEvent)