+import eConsoleImpl
import eBaseImpl
import enigma
enigma.eTimer = eBaseImpl.eTimer
enigma.eSocketNotifier = eBaseImpl.eSocketNotifier
+enigma.eConsoleAppContainer = eConsoleImpl.eConsoleAppContainer
from Tools.Profile import profile, profile_final
profile("PYTHON_START")
-from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
- getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \
+ getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
from tools import *
profile("LANGUAGE")
from Navigation import Navigation
profile("LOAD:skin")
-from skin import readSkin, applyAllAttributes
+from skin import readSkin
profile("LOAD:Tools")
from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText, ConfigYesNo
InitFallbackFiles()
profile("ReloadProfiles")
eDVBDB.getInstance().reloadBouquets()
config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
+config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
+config.misc.useTransponderTime = ConfigYesNo(default=True)
+
+def useTransponderTimeChanged(configElement):
+ enigma.eDVBLocalTimeHandler.getInstance().setUseDVBTime(configElement.value)
+config.misc.useTransponderTime.addNotifier(useTransponderTimeChanged)
profile("Twisted")
try:
from twisted.internet import reactor
def runReactor():
- reactor.run()
+ reactor.run(installSignalHandlers=False)
except ImportError:
print "twisted not available"
def runReactor():
profile("LOAD:Wizard")
from Screens.Wizard import wizardManager
-from Screens.ImageWizard import *
+from Screens.DefaultWizard import *
from Screens.StartWizard import *
from Screens.TutorialWizard import *
+import Screens.Rc
from Tools.BoundFunction import boundFunction
from Plugins.Plugin import PluginDescriptor
# display
-class OutputDevice:
- def create(self, screen): pass
-
-class GUIOutputDevice(OutputDevice):
- parent = None
- def create(self, comp, desktop):
- comp.createGUIScreen(self.parent, desktop)
-
profile("LOAD:ScreenGlobals")
from Screens.Globals import Globals
from Screens.SessionGlobals import SessionGlobals
# create GUI view of this dialog
assert desktop is not None
- z = 0
- title = ""
- for (key, value) in dlg.skinAttributes:
- if key == "zPosition":
- z = int(value)
- elif key == "title":
- title = value
-
- dlg.instance = eWindow(desktop, z)
- dlg.title = title
- applyAllAttributes(dlg.instance, desktop, dlg.skinAttributes)
- gui = GUIOutputDevice()
- gui.parent = dlg.instance
- gui.create(dlg, desktop)
+ dlg.setDesktop(desktop)
+ dlg.applySkin()
return dlg
self.execEnd(last=False)
def popCurrent(self):
- if len(self.dialog_stack):
+ if self.dialog_stack:
(self.current_dialog, do_show) = self.dialog_stack.pop()
self.execBegin(first=False, do_show=do_show)
else:
return dlg
def open(self, screen, *arguments, **kwargs):
- if len(self.dialog_stack) and not self.in_exec:
- raise "modal open are allowed only from a screen which is modal!"
+ if self.dialog_stack and not self.in_exec:
+ raise RuntimeError("modal open are allowed only from a screen which is modal!")
# ...unless it's the very first screen.
self.pushCurrent()
if self.summary is not None:
self.summary.show()
-from Screens.Volume import Volume
-from Screens.Mute import Mute
-from GlobalActions import globalActionMap
-
-profile("VolumeControl")
-#TODO .. move this to a own .py file
-class VolumeControl:
- """Volume control, handles volUp, volDown, volMute actions and display
- a corresponding dialog"""
- def __init__(self, session):
- global globalActionMap
- globalActionMap.actions["volumeUp"]=self.volUp
- globalActionMap.actions["volumeDown"]=self.volDown
- globalActionMap.actions["volumeMute"]=self.volMute
-
- config.audio = ConfigSubsection()
- config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))
-
- self.volumeDialog = session.instantiateDialog(Volume)
- self.muteDialog = session.instantiateDialog(Mute)
-
- self.hideVolTimer = eTimer()
- self.hideVolTimer.callback.append(self.volHide)
-
- vol = config.audio.volume.value
- self.volumeDialog.setValue(vol)
- self.volctrl = eDVBVolumecontrol.getInstance()
- self.volctrl.setVolume(vol, vol)
-
- def volSave(self):
- if self.volctrl.isMuted():
- config.audio.volume.value = 0
- else:
- config.audio.volume.value = self.volctrl.getVolume()
- config.audio.volume.save()
-
- def volUp(self):
- self.setVolume(+1)
-
- def volDown(self):
- self.setVolume(-1)
-
- def setVolume(self, direction):
- oldvol = self.volctrl.getVolume()
- if direction > 0:
- self.volctrl.volumeUp()
- else:
- self.volctrl.volumeDown()
- is_muted = self.volctrl.isMuted()
- vol = self.volctrl.getVolume()
- self.volumeDialog.show()
- if is_muted:
- self.volMute() # unmute
- elif not vol:
- self.volMute(False, True) # mute but dont show mute symbol
- if self.volctrl.isMuted():
- self.volumeDialog.setValue(0)
- else:
- self.volumeDialog.setValue(self.volctrl.getVolume())
- self.volSave()
- self.hideVolTimer.start(3000, True)
-
- def volHide(self):
- self.volumeDialog.hide()
-
- def volMute(self, showMuteSymbol=True, force=False):
- vol = self.volctrl.getVolume()
- if vol or force:
- self.volctrl.volumeToggleMute()
- if self.volctrl.isMuted():
- if showMuteSymbol:
- self.muteDialog.show()
- self.volumeDialog.setValue(0)
- else:
- self.muteDialog.hide()
- self.volumeDialog.setValue(vol)
-
profile("Standby,PowerKey")
import Screens.Standby
from Screens.Menu import MainMenu, mdom
-import xml.dom.minidom
+from GlobalActions import globalActionMap
class PowerKey:
""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
def shutdown(self):
print "PowerOff - Now!"
- if not Screens.Standby.inTryQuitMainloop:
+ if not Screens.Standby.inTryQuitMainloop and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
self.session.open(Screens.Standby.TryQuitMainloop, 1)
-
+
def powerlong(self):
+ if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
+ return
+
self.standbyblocked = 1
action = config.usage.on_long_powerpress.value
if action == "shutdown":
self.shutdown()
elif action == "show_menu":
print "Show shutdown Menu"
- menu = mdom.childNodes[0]
- for x in menu.childNodes:
- if x.nodeType != xml.dom.minidom.Element.nodeType:
- continue
- elif x.tagName == 'menu':
- for y in x.childNodes:
- if y.nodeType != xml.dom.minidom.Element.nodeType:
- continue
- elif y.tagName == 'id':
- id = y.getAttribute("val")
- if id and id == "shutdown":
- self.session.infobar = self
- menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes)
- menu_screen.setTitle(_("Standby / Restart"))
- return
+ root = mdom.getroot()
+ for x in root.findall("menu"):
+ y = x.find("id")
+ if y is not None:
+ id = y.get("val")
+ if id and id == "shutdown":
+ self.session.infobar = self
+ menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x)
+ menu_screen.setTitle(_("Standby / Restart"))
+ return
def powerdown(self):
self.standbyblocked = 0
self.standby()
def standby(self):
- if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+ if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec:
self.session.open(Screens.Standby.Standby)
profile("Scart")
from enigma import eDVBCIInterfaces
from Screens.Ci import CiHandler
+profile("Load:VolumeControl")
+from Components.VolumeControl import VolumeControl
+
def runScreenTest():
profile("readPluginList")
plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
profile("Init:Session")
- session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
+ nav = Navigation(config.misc.isNextRecordTimerAfterEventActionAuto.value)
+ session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = nav)
CiHandler.setSession(session)
- screensToRun = [ ]
-
- for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
- screensToRun.append(p.__call__)
+ screensToRun = [ p.__call__ for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD) ]
profile("wizards")
screensToRun += wizardManager.getWizards()
return
screen = screensToRun[0][1]
+ args = screensToRun[0][2:]
- if len(screensToRun):
- session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+ if screensToRun:
+ session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen, *args)
else:
- session.open(screen)
+ session.open(screen, *args)
runNextScreen(session, screensToRun)
profile("RunReactor")
profile_final()
runReactor()
- profile("configfile.save")
- configfile.save()
profile("wakeup")
- from time import time
- from Tools.DreamboxHardware import setFPWakeuptime
+ from time import time, strftime, localtime
+ from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime
#get currentTime
nowTime = time()
wakeupList = [
- x for x in
- [session.nav.RecordTimer.getNextRecordingTime(),
- session.nav.RecordTimer.getNextZapTime(),
- plugins.getNextWakeupTime()]
- if x != -1
+ x for x in ((session.nav.RecordTimer.getNextRecordingTime(), 0, session.nav.RecordTimer.isNextRecordAfterEventActionAuto()),
+ (session.nav.RecordTimer.getNextZapTime(), 1),
+ (plugins.getNextWakeupTime(), 2))
+ if x[0] != -1
]
wakeupList.sort()
- if len(wakeupList):
- startTime = wakeupList.pop(0)
- if (startTime - nowTime < 330): # no time to switch box back on
- setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
+ recordTimerWakeupAuto = False
+ if wakeupList:
+ from time import strftime
+ startTime = wakeupList[0]
+ if (startTime[0] - nowTime) < 270: # no time to switch box back on
+ wptime = nowTime + 30 # so switch back on in 30 seconds
else:
- setFPWakeuptime(startTime - 300)
+ wptime = startTime[0] - 240
+ if not config.misc.useTransponderTime.value:
+ print "dvb time sync disabled... so set RTC now to current linux time!", strftime("%Y/%m/%d %H:%M", localtime(nowTime))
+ setRTCtime(nowTime)
+ print "set wakeup time to", strftime("%Y/%m/%d %H:%M", localtime(wptime))
+ setFPWakeuptime(wptime)
+ recordTimerWakeupAuto = startTime[1] == 0 and startTime[2]
+ config.misc.isNextRecordTimerAfterEventActionAuto.value = recordTimerWakeupAuto
+ config.misc.isNextRecordTimerAfterEventActionAuto.save()
+
profile("stopService")
session.nav.stopService()
profile("nav shutdown")
session.nav.shutdown()
+ profile("configfile.save")
+ configfile.save()
+
return 0
profile("Init:skin")
import Screens.Ci
Screens.Ci.InitCiConfig()
+#from enigma import dump_malloc_stats
+#t = eTimer()
+#t.callback.append(dump_malloc_stats)
+#t.start(1000)
+
# first, setup a screen
try:
runScreenTest()
git.cweiske.de / enigma2.git / blobdiff