X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d0f2817f1832e912282c886454e4f8112da56966..85d9c9888483749617edd6fa87064e4885468e1f:/mytest.py

diff --git a/mytest.py b/mytest.py
index 8ea13e0a..4c30de93 100644
--- a/mytest.py
+++ b/mytest.py
@@ -19,21 +19,27 @@ import time
 
 import ServiceReference
 
+from Components.ParentalControl import InitParentalControl
+InitParentalControl()
+
 from Navigation import Navigation
 
 from skin import readSkin, applyAllAttributes
 
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import configfile, configElement, configText, ConfigSubsection, config, configSequence, configsequencearg
+from Components.config import config, ConfigText, configfile, ConfigSubsection, ConfigInteger
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
-config.misc.radiopic = configElement("config.misc.radiopic", configText, resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi", 0)
+config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
 
 try:
 	import e2reactor
 	e2reactor.install()
 	
+	import twisted.python.runtime
+	twisted.python.runtime.platform.supportsThreads = lambda: False
+	
 	from twisted.internet import reactor
 	
 	def runReactor():
@@ -193,6 +199,10 @@ class Session:
 	def instantiateDialog(self, screen, *arguments, **kwargs):
 		return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
 	
+	def deleteDialog(self, screen):
+		screen.hide()
+		screen.doClose()
+	
 	def instantiateSummaryDialog(self, screen, *arguments, **kwargs):
 		return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop)
 	
@@ -316,7 +326,7 @@ class VolumeControl:
 		globalActionMap.actions["volumeMute"]=self.volMute
 
 		config.audio = ConfigSubsection()
-		config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100)))
+		config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))
 
 		self.volumeDialog = session.instantiateDialog(Volume)
 		self.muteDialog = session.instantiateDialog(Mute)
@@ -324,7 +334,8 @@ class VolumeControl:
 		self.hideVolTimer = eTimer()
 		self.hideVolTimer.timeout.get().append(self.volHide)
 
-		vol = config.audio.volume.value[0]
+		vol = config.audio.volume.value
+		print "volume is", vol
 		self.volumeDialog.setValue(vol)
 		eDVBVolumecontrol.getInstance().setVolume(vol, vol)
 
@@ -404,6 +415,31 @@ class PowerKey:
 		# halt
 		quitMainloop(1)
 
+from Screens.Scart import Scart
+
+class AutoScartControl:
+	def __init__(self, session):
+		self.force = False
+		self.current_vcr_sb = eAVSwitch.getInstance().getVCRSlowBlanking()
+		if self.current_vcr_sb and config.av.vcrswitch.value:
+			self.scartDialog = session.instantiateDialog(Scart, True)
+		else:
+			self.scartDialog = session.instantiateDialog(Scart, False)
+		config.av.vcrswitch.addNotifier(self.recheckVCRSb)
+		eAVSwitch.getInstance().vcr_sb_notifier.get().append(self.VCRSbChanged)
+
+	def recheckVCRSb(self, configElement):
+		self.VCRSbChanged(self.current_vcr_sb)
+
+	def VCRSbChanged(self, value):
+		#print "vcr sb changed to", value
+		self.current_vcr_sb = value
+		if config.av.vcrswitch.value or value > 2:
+			if value:
+				self.scartDialog.showMessageBox()
+			else:
+				self.scartDialog.switchToTV()
+
 def runScreenTest():
 	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
@@ -436,6 +472,9 @@ def runScreenTest():
 	
 	vol = VolumeControl(session)
 	power = PowerKey(session)
+
+	# we need session.scart to access it from within menu.xml
+	session.scart = AutoScartControl(session)
 	
 	runReactor()
 	
@@ -450,6 +489,7 @@ def runScreenTest():
 		else:
 			setFPWakeuptime(nextRecordingTime - (300))
 	
+	session.nav.stopService()
 	session.nav.shutdown()
 	
 	return 0
@@ -493,6 +533,9 @@ try:
 	runScreenTest()
 
 	plugins.shutdown()
+	
+	from Components.ParentalControl import parentalControl
+	parentalControl.save()
 except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60