Merge branch 'acid-burn/bug_439_dvdplayer_missing_titlestring' into experimental

[enigma2.git] / lib / python / Screens / Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index fd7ca8efdca072e04cd7168f89aa6a6643b629fd..1a7ebbd1ae61b09fa7c5716cae28fe5475ad7884 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -2,6 +2,8 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch
 from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch

+from Components.SystemInfo import SystemInfo
+from GlobalActions import globalActionMap

 from enigma import eDVBVolumecontrol
 
 inStandby = None
 from enigma import eDVBVolumecontrol
 
 inStandby = None


@@ -14,8 +16,6 @@ class Standby(Screen):
                #restart last played service
                #unmute adc
                self.leaveMute()
                #restart last played service
                #unmute adc
                self.leaveMute()

-               #set brightness of lcd
-               config.lcd.bright.apply()

                #kill me
                self.close(True)
 
                #kill me
                self.close(True)
 


@@ -42,34 +42,49 @@ class Standby(Screen):
                        "power": self.Power
                }, -1)
 
                        "power": self.Power
                }, -1)
 

+               globalActionMap.setEnabled(False)
+

                #mute adc
                self.setMute()
                #mute adc
                self.setMute()

-               #get currently playing service reference
-               self.prev_running_service = self.session.nav.getCurrentlyPlayingServiceReference()
-               #stop actual played dvb-service
-               self.session.nav.stopService()
+
+               self.paused_service = None
+               self.prev_running_service = None
+               if self.session.current_dialog:
+                       if self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_STOPS:
+                               #get currently playing service reference
+                               self.prev_running_service = self.session.nav.getCurrentlyPlayingServiceReference()
+                               #stop actual played dvb-service
+                               self.session.nav.stopService()
+                       elif self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_PAUSES:
+                               self.paused_service = self.session.current_dialog
+                               self.paused_service.pauseService()
+

                #set input to vcr scart
                #set input to vcr scart

-               self.avswitch.setInput("SCART")
-               #set lcd brightness to standby value
-               config.lcd.standby.apply()
-               self.onShow.append(self.__onShow)
-               self.onHide.append(self.__onHide)
+               if SystemInfo["ScartSwitch"]:
+                       self.avswitch.setInput("SCART")
+               else:
+                       self.avswitch.setInput("AUX")
+               self.onFirstExecBegin.append(self.__onFirstExecBegin)

                self.onClose.append(self.__onClose)
 
        def __onClose(self):
                self.onClose.append(self.__onClose)
 
        def __onClose(self):

+               global inStandby
+               inStandby = None

                if self.prev_running_service:
                        self.session.nav.playService(self.prev_running_service)
                if self.prev_running_service:
                        self.session.nav.playService(self.prev_running_service)

+               elif self.paused_service:
+                       self.paused_service.unPauseService()
+               self.session.screen["Standby"].boolean = False
+               globalActionMap.setEnabled(True)

 
 

-       def createSummary(self):
-               return StandbySummary
-
-       def __onShow(self):
+       def __onFirstExecBegin(self):

                global inStandby
                inStandby = self
                global inStandby
                inStandby = self

+               self.session.screen["Standby"].boolean = True
+               config.misc.standbyCounter.value += 1

 
 

-       def __onHide(self):
-               global inStandby
-               inStandby = None
+       def createSummary(self):
+               return StandbySummary

 
 class StandbySummary(Screen):
        skin = """
 
 class StandbySummary(Screen):
        skin = """


@@ -83,32 +98,40 @@ class StandbySummary(Screen):
                </widget>
        </screen>"""
 
                </widget>
        </screen>"""
 

-       def __init__(self, session, parent):
-               Screen.__init__(self, session)
-

 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox
 from time import time
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox
 from time import time

+from Components.Task import job_manager

 
 inTryQuitMainloop = False
 
 class TryQuitMainloop(MessageBox):
        def __init__(self, session, retvalue=1, timeout=-1, default_yes = True):
                self.retval=retvalue
 
 inTryQuitMainloop = False
 
 class TryQuitMainloop(MessageBox):
        def __init__(self, session, retvalue=1, timeout=-1, default_yes = True):
                self.retval=retvalue

-               recordings = len(session.nav.getRecordings())
+               recordings = session.nav.getRecordings()
+               jobs = len(job_manager.getPendingJobs())

                self.connected = False
                self.connected = False

+               reason = ""

                next_rec_time = -1
                if not recordings:
                next_rec_time = -1
                if not recordings:

-                       next_rec_time = session.nav.RecordTimer.getNextRecordingTime()
+                       next_rec_time = session.nav.RecordTimer.getNextRecordingTime()  

                if recordings or (next_rec_time > 0 and (next_rec_time - time()) < 360):
                if recordings or (next_rec_time > 0 and (next_rec_time - time()) < 360):

+                       reason = _("Recording(s) are in progress or coming up in few seconds!") + '\n'
+               if jobs:
+                       if jobs == 1:
+                               job = job_manager.getPendingJobs()[0]
+                               reason += "%s: %s (%d%%)\n" % (job.getStatustext(), job.name, int(100*job.progress/float(job.end)))
+                       else:
+                               reason += (_("%d jobs are running in the background!") % jobs) + '\n'
+               if reason:

                        if retvalue == 1:
                        if retvalue == 1:

-                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really shutdown now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)
+                               MessageBox.__init__(self, session, reason+_("Really shutdown now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)

                        elif retvalue == 2:
                        elif retvalue == 2:

-                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really reboot now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)
+                               MessageBox.__init__(self, session, reason+_("Really reboot now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)

                        elif retvalue == 4:
                                pass
                        else:
                        elif retvalue == 4:
                                pass
                        else:

-                               MessageBox.__init__(self, session, _("Recording(s) are in progress or coming up in few seconds... really restart now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)
+                               MessageBox.__init__(self, session, reason+_("Really restart now?"), type = MessageBox.TYPE_YESNO, timeout = timeout, default = default_yes)

                        self.skinName = "MessageBox"
                        session.nav.record_event.append(self.getRecordEvent)
                        self.connected = True
                        self.skinName = "MessageBox"
                        session.nav.record_event.append(self.getRecordEvent)
                        self.connected = True


@@ -122,7 +145,7 @@ class TryQuitMainloop(MessageBox):
        def getRecordEvent(self, recservice, event):
                if event == iRecordableService.evEnd:
                        recordings = self.session.nav.getRecordings()
        def getRecordEvent(self, recservice, event):
                if event == iRecordableService.evEnd:
                        recordings = self.session.nav.getRecordings()

-                       if not len(recordings): # no more recordings exist
+                       if not recordings: # no more recordings exist

                                rec_time = self.session.nav.RecordTimer.getNextRecordingTime()
                                if rec_time > 0 and (rec_time - time()) < 360:
                                        self.initTimeout(360) # wait for next starting timer
                                rec_time = self.session.nav.RecordTimer.getNextRecordingTime()
                                if rec_time > 0 and (rec_time - time()) < 360:
                                        self.initTimeout(360) # wait for next starting timer


@@ -137,9 +160,14 @@ class TryQuitMainloop(MessageBox):
                        self.conntected=False
                        self.session.nav.record_event.remove(self.getRecordEvent)
                if value:
                        self.conntected=False
                        self.session.nav.record_event.remove(self.getRecordEvent)
                if value:

-                       quitMainloop(self.retval)
-               else:
-                       MessageBox.close(self, True)
+                       # hack .. we dont like to show any other screens when this screen has closed
+                       self.onClose = [self.__closed]
+                       self.session.dialog_stack = []
+                       self.session.summary_stack = [None]
+               MessageBox.close(self, True)
+
+       def __closed(self):
+               quitMainloop(self.retval)

 
        def __onShow(self):
                global inTryQuitMainloop
 
        def __onShow(self):
                global inTryQuitMainloop