restart previous running services in onClose event

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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 13c3ad317a0a500defcc8dd1648ad9f2a9cac54a..85f342003be3674a3e322ee1f6f260805425f755 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -9,7 +9,6 @@ from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.PluginComponent import plugins
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Pixmap import Pixmap
 from Components.PluginComponent import plugins
 from Components.ServiceEventTracker import ServiceEventTracker

-from Components.Sources.Source import ObsoleteSource

 from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, ConfigClock
 from Components.SystemInfo import SystemInfo
 from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, ConfigClock
 from Components.SystemInfo import SystemInfo


@@ -539,17 +538,6 @@ class InfoBarEPG:
                        self.epglist[1]=tmp
                        setEvent(self.epglist[0])
 
                        self.epglist[1]=tmp
                        setEvent(self.epglist[0])
 

-class InfoBarTuner:
-       """provides a snr/agc/ber display"""
-       def __init__(self):
-               self["FrontendStatus"] = ObsoleteSource(new_source = "session.FrontendStatus", removal_date = "2008-01")
-
-class InfoBarEvent:
-       """provides a current/next event info display"""
-       def __init__(self):
-               self["Event_Now"] = ObsoleteSource(new_source = "session.Event_Now", removal_date = "2008-01")
-               self["Event_Next"] = ObsoleteSource(new_source = "session.Event_Next", removal_date = "2008-01")
-

 class InfoBarRdsDecoder:
        """provides RDS and Rass support/display"""
        def __init__(self):
 class InfoBarRdsDecoder:
        """provides RDS and Rass support/display"""
        def __init__(self):


@@ -598,10 +586,6 @@ class InfoBarRdsDecoder:
                        self.RassSlidePicChanged()
                self.rds_display.show()
 
                        self.RassSlidePicChanged()
                self.rds_display.show()
 

-class InfoBarServiceName:
-       def __init__(self):
-               self["CurrentService"] = ObsoleteSource(new_source = "session.CurrentService", removal_date = "2008-01")
-

 class InfoBarSeek:
        """handles actions like seeking, pause"""
 
 class InfoBarSeek:
        """handles actions like seeking, pause"""
 


@@ -609,7 +593,7 @@ class InfoBarSeek:
        SEEK_STATE_PAUSE = (1, 0, 0, "||")
        SEEK_STATE_EOF = (1, 0, 0, "END")
 
        SEEK_STATE_PAUSE = (1, 0, 0, "||")
        SEEK_STATE_EOF = (1, 0, 0, "END")
 

-       def __init__(self, actionmap = "InfobarSeekActions"):
+       def __init__(self, actionmap = "InfobarSeekActions", useSeekBackHack=True):

                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                                iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,


@@ -624,7 +608,7 @@ class InfoBarSeek:
                self.eofInhibitTimer = eTimer()
                self.eofInhibitTimer.timeout.get().append(self.inhibitEof)
 
                self.eofInhibitTimer = eTimer()
                self.eofInhibitTimer.timeout.get().append(self.inhibitEof)
 

-#              self.minSpeedBackward = 16
+               self.minSpeedBackward = useSeekBackHack and 16 or 0

 
                class InfoBarSeekActionMap(HelpableActionMap):
                        def __init__(self, screen, *args, **kwargs):
 
                class InfoBarSeekActionMap(HelpableActionMap):
                        def __init__(self, screen, *args, **kwargs):


@@ -682,13 +666,12 @@ class InfoBarSeek:
        def makeStateBackward(self, n):
                minspeed = config.seek.stepwise_minspeed.value
                repeat = int(config.seek.stepwise_repeat.value)
        def makeStateBackward(self, n):
                minspeed = config.seek.stepwise_minspeed.value
                repeat = int(config.seek.stepwise_repeat.value)

-#              if n < self.minSpeedBackward:
-#                      r = (self.minSpeedBackward - 1)/ n + 1
-#                      if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-#                              r = max(r, repeat)
-#                      return (0, -n * r, r, "<< %dx" % n)
-#              el
-               if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
+               if self.minSpeedBackward and n < self.minSpeedBackward:
+                       r = (self.minSpeedBackward - 1)/ n + 1
+                       if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
+                               r = max(r, repeat)
+                       return (0, -n * r, r, "<< %dx" % n)
+               elif minspeed != "Never" and n >= int(minspeed) and repeat > 1:

                        return (0, -n * repeat, repeat, "<< %dx" % n)
                else:
                        return (0, -n, 0, "<< %dx" % n)
                        return (0, -n * repeat, repeat, "<< %dx" % n)
                else:
                        return (0, -n, 0, "<< %dx" % n)


@@ -747,14 +730,14 @@ class InfoBarSeek:
                return True
 
        def __seekableStatusChanged(self):
                return True
 
        def __seekableStatusChanged(self):

-               print "seekable status changed!"
+#              print "seekable status changed!"

                if not self.isSeekable():
                        self["SeekActions"].setEnabled(False)
                if not self.isSeekable():
                        self["SeekActions"].setEnabled(False)

-                       print "not seekable, return to play"
+#                      print "not seekable, return to play"

                        self.setSeekState(self.SEEK_STATE_PLAY)
                else:
                        self["SeekActions"].setEnabled(True)
                        self.setSeekState(self.SEEK_STATE_PLAY)
                else:
                        self["SeekActions"].setEnabled(True)

-                       print "seekable"
+#                      print "seekable"

 
        def __serviceStarted(self):
                self.seekstate = self.SEEK_STATE_PLAY
 
        def __serviceStarted(self):
                self.seekstate = self.SEEK_STATE_PLAY


@@ -1187,8 +1170,8 @@ class InfoBarTimeshift:
        def __seekableStatusChanged(self):
                enabled = False
 
        def __seekableStatusChanged(self):
                enabled = False
 

-               print "self.isSeekable", self.isSeekable()
-               print "self.timeshift_enabled", self.timeshift_enabled
+#              print "self.isSeekable", self.isSeekable()
+#              print "self.timeshift_enabled", self.timeshift_enabled

 
                # when this service is not seekable, but timeshift
                # is enabled, this means we can activate
 
                # when this service is not seekable, but timeshift
                # is enabled, this means we can activate


@@ -1196,7 +1179,7 @@ class InfoBarTimeshift:
                if not self.isSeekable() and self.timeshift_enabled:
                        enabled = True
 
                if not self.isSeekable() and self.timeshift_enabled:
                        enabled = True
 

-               print "timeshift activate:", enabled
+#              print "timeshift activate:", enabled

                self["TimeshiftActivateActions"].setEnabled(enabled)
 
        def __serviceStarted(self):
                self["TimeshiftActivateActions"].setEnabled(enabled)
 
        def __serviceStarted(self):


@@ -1296,10 +1279,7 @@ class InfoBarPlugins:
 # depends on InfoBarExtensions
 class InfoBarSleepTimer:
        def __init__(self):
 # depends on InfoBarExtensions
 class InfoBarSleepTimer:
        def __init__(self):

-               self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, self.available), "1")
-
-       def available(self):
-               return True
+               self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, lambda: True), "1")

 
        def getSleepTimerName(self):
                return _("Sleep Timer")
 
        def getSleepTimerName(self):
                return _("Sleep Timer")


@@ -1312,13 +1292,10 @@ class InfoBarPiP:
        def __init__(self):
                self.session.pipshown = False
                if SystemInfo.get("NumVideoDecoders", 1) > 1:
        def __init__(self):
                self.session.pipshown = False
                if SystemInfo.get("NumVideoDecoders", 1) > 1:

-                       self.addExtension((self.getShowHideName, self.showPiP, self.available), "blue")
+                       self.addExtension((self.getShowHideName, self.showPiP, lambda: True), "blue")

                        self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
                        self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
 
                        self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
                        self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
 

-       def available(self):
-               return SystemInfo.get("NumVideoDecoders", 1) > 1
-

        def pipShown(self):
                return self.session.pipshown
 
        def pipShown(self):
                return self.session.pipshown
 


@@ -1379,7 +1356,7 @@ class InfoBarPiP:
                elif "stop" == use:
                        self.showPiP()
 
                elif "stop" == use:
                        self.showPiP()
 

-from RecordTimer import parseEvent
+from RecordTimer import parseEvent, RecordTimerEntry

 
 class InfoBarInstantRecord:
        """Instant Record - handles the instantRecord action in order to
 
 class InfoBarInstantRecord:
        """Instant Record - handles the instantRecord action in order to


@@ -1390,13 +1367,6 @@ class InfoBarInstantRecord:
                                "instantRecord": (self.instantRecord, _("Instant Record...")),
                        })
                self.recording = []
                                "instantRecord": (self.instantRecord, _("Instant Record...")),
                        })
                self.recording = []

-#### DEPRECATED CODE ####
-               self["BlinkingPoint"] = BlinkingPixmapConditional()
-               self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
-               self["BlinkingPoint"].deprecationInfo = (
-                       "session.RecordState source, Pixmap renderer and "
-                       "ConditionalShowHide/Blink Converter", "2008-02")
-#########################

 
        def stopCurrentRecording(self, entry = -1):
                if entry is not None and entry != -1:
 
        def stopCurrentRecording(self, entry = -1):
                if entry is not None and entry != -1:


@@ -1436,15 +1406,15 @@ class InfoBarInstantRecord:
                        if limitEvent:
                                self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO)
 
                        if limitEvent:
                                self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO)
 

-               data = (begin, end, name, description, eventid)
+               # TODO: needed?
+               if isinstance(serviceref, eServiceReference):
+                       serviceref = ServiceReference(serviceref)

 
 

-               recording = self.session.nav.recordWithTimer(serviceref, *data)
+               recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)

                recording.dontSave = True
                recording.dontSave = True

-               self.recording.append(recording)

 
 

-#### DEPRECATED CODE ####
-               self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
-#########################
+               self.session.nav.RecordTimer.record(recording)
+               self.recording.append(recording)

 
        def isInstantRecordRunning(self):
                print "self.recording:", self.recording
 
        def isInstantRecordRunning(self):
                print "self.recording:", self.recording


@@ -1554,10 +1524,8 @@ class InfoBarAudioSelection:
 
        def audioSelection(self):
                service = self.session.nav.getCurrentService()
 
        def audioSelection(self):
                service = self.session.nav.getCurrentService()

-               audio = service and service.audioTracks()
-               self.audioTracks = audio
+               self.audioTracks = audio = service and service.audioTracks()

                n = audio and audio.getNumberOfTracks() or 0
                n = audio and audio.getNumberOfTracks() or 0

-               keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n

                tlist = []
                if n > 0:
                        self.audioChannel = service.audioChannel()
                tlist = []
                if n > 0:
                        self.audioChannel = service.audioChannel()


@@ -1577,21 +1545,45 @@ class InfoBarAudioSelection:
 
                                tlist.append((description, x))
 
 
                                tlist.append((description, x))
 

-                       selectedAudio = audio.getCurrentTrack()

                        tlist.sort(key=lambda x: x[0])
 
                        tlist.sort(key=lambda x: x[0])
 

-                       selection = 2
+                       selectedAudio = self.audioTracks.getCurrentTrack()
+
+                       selection = 0
+

                        for x in tlist:
                                if x[1] != selectedAudio:
                                        selection += 1
                                else:
                                        break
 
                        for x in tlist:
                                if x[1] != selectedAudio:
                                        selection += 1
                                else:
                                        break
 

-                       tlist = [([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"), ("--", "")] + tlist
+                       if SystemInfo["CanDownmixAC3"]:
+                               tlist = [(_("AC3 downmix") + " - " +[_("Off"), _("On")][config.av.downmix_ac3.value and 1 or 0], "CALLFUNC", self.changeAC3Downmix),
+                                       ([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"),
+                                       ("--", "")] + tlist
+                               keys = [ "red", "green", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
+                               selection += 3
+                       else:
+                               tlist = [([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"), ("--", "")] + tlist
+                               keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
+                               selection += 2

                        self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = tlist, selection = selection, keys = keys)
                else:
                        del self.audioTracks
 
                        self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = tlist, selection = selection, keys = keys)
                else:
                        del self.audioTracks
 

+       def changeAC3Downmix(self, arg):
+               choicelist = self.session.current_dialog["list"]
+               list = choicelist.list
+               t = list[0][1]
+               list[0][1]=(t[0], t[1], t[2], t[3], t[4], t[5], t[6],
+                       _("AC3 downmix") + " - " +[_("On"), _("Off")][config.av.downmix_ac3.value and 1 or 0])
+               choicelist.setList(list)
+               if config.av.downmix_ac3.value:
+                       config.av.downmix_ac3.value = False
+               else:
+                       config.av.downmix_ac3.value = True
+               config.av.downmix_ac3.save()
+

        def audioSelected(self, audio):
                if audio is not None:
                        if isinstance(audio[1], str):
        def audioSelected(self, audio):
                if audio is not None:
                        if isinstance(audio[1], str):


@@ -1627,16 +1619,18 @@ class InfoBarSubserviceSelection:
                        }, -1)
                self["SubserviceQuickzapAction"].setEnabled(False)
 
                        }, -1)
                self["SubserviceQuickzapAction"].setEnabled(False)
 

-               self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events
+               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+                       {
+                               iPlayableService.evUpdatedInfo: self.checkSubservicesAvail
+                       })

 
                self.bsel = None
 
 
                self.bsel = None
 

-       def checkSubservicesAvail(self, ev):
-               if ev == iPlayableService.evUpdatedEventInfo:
-                       service = self.session.nav.getCurrentService()
-                       subservices = service and service.subServices()
-                       if not subservices or subservices.getNumberOfSubservices() == 0:
-                               self["SubserviceQuickzapAction"].setEnabled(False)
+       def checkSubservicesAvail(self):
+               service = self.session.nav.getCurrentService()
+               subservices = service and service.subServices()
+               if not subservices or subservices.getNumberOfSubservices() == 0:
+                       self["SubserviceQuickzapAction"].setEnabled(False)

 
        def nextSubservice(self):
                self.changeSubservice(+1)
 
        def nextSubservice(self):
                self.changeSubservice(+1)


@@ -1664,7 +1658,7 @@ class InfoBarSubserviceSelection:
                                if newservice.valid():
                                        del subservices
                                        del service
                                if newservice.valid():
                                        del subservices
                                        del service

-                                       self.session.nav.playService(newservice)
+                                       self.session.nav.playService(newservice, False)

 
        def subserviceSelection(self):
                service = self.session.nav.getCurrentService()
 
        def subserviceSelection(self):
                service = self.session.nav.getCurrentService()


@@ -1682,7 +1676,7 @@ class InfoBarSubserviceSelection:
                                tlist.append((i.getName(), i))
 
                        if self.bouquets and len(self.bouquets):
                                tlist.append((i.getName(), i))
 
                        if self.bouquets and len(self.bouquets):

-                               keys = ["red", "green", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
+                               keys = ["red", "blue", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n

                                if config.usage.multibouquet.value:
                                        tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
                                else:
                                if config.usage.multibouquet.value:
                                        tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
                                else:


@@ -1704,7 +1698,7 @@ class InfoBarSubserviceSelection:
                                        self.session.open(SubservicesQuickzap, service[2])
                        else:
                                self["SubserviceQuickzapAction"].setEnabled(True)
                                        self.session.open(SubservicesQuickzap, service[2])
                        else:
                                self["SubserviceQuickzapAction"].setEnabled(True)

-                               self.session.nav.playService(service[1])
+                               self.session.nav.playService(service[1], False)

 
        def addSubserviceToBouquetCallback(self, service):
                if len(service) > 1 and isinstance(service[1], eServiceReference):
 
        def addSubserviceToBouquetCallback(self, service):
                if len(service) > 1 and isinstance(service[1], eServiceReference):


@@ -1739,59 +1733,6 @@ class InfoBarAdditionalInfo:
                self["TimeshiftPossible"] = self["RecordingPossible"]
                self["ExtensionsAvailable"] = Boolean(fixed=1)
 
                self["TimeshiftPossible"] = self["RecordingPossible"]
                self["ExtensionsAvailable"] = Boolean(fixed=1)
 

-######### DEPRECATED CODE ##########
-               self["NimA"] = Pixmap()
-               self["NimA"].deprecationInfo = (
-                       "session.TunerInfo source, Pixmap renderer, TunerInfo/UseMask Converter"
-                       ", ValueBitTest(1) Converter and ConditionalShowHide Converter", "2008-02")
-               self["NimB"] = Pixmap()
-               self["NimB"].deprecationInfo = (
-                       "session.TunerInfo source, Pixmap renderer, TunerInfo/UseMask Converter"
-                       ", ValueBitTest(2) Converter and ConditionalShowHide Converter", "2008-02")
-               self["NimA_Active"] = Pixmap()
-               self["NimA_Active"].deprecationInfo = (
-                       "session.FrontendInfo source, Pixmap renderer, FrontendInfo/NUMBER Converter"
-                       ", ValueRange(1,1) Converter and ConditionalShowHide Converter", "2008-02")
-               self["NimB_Active"] = Pixmap()
-               self["NimB_Active"].deprecationInfo = (
-                       "session.FrontendInfo source, Pixmap renderer, FrontendInfo/NUMBER Converter"
-                       ", ValueRange(1,1) Converter and ConditionalShowHide Converter", "2008-02")
-
-               res_mgr = eDVBResourceManager.getInstance()
-               if res_mgr:
-                       res_mgr.frontendUseMaskChanged.get().append(self.tunerUseMaskChanged)
-
-               self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
-
-       def tunerUseMaskChanged(self, mask):
-               if mask&1:
-                       self["NimA_Active"].show()
-               else:
-                       self["NimA_Active"].hide()
-               if mask&2:
-                       self["NimB_Active"].show()
-               else:
-                       self["NimB_Active"].hide()
-
-       def checkTunerState(self, service):
-               info = service and service.frontendInfo()
-               feNumber = info and info.getFrontendInfo(iFrontendInformation.frontendNumber)
-               if feNumber is None:
-                       self["NimA"].hide()
-                       self["NimB"].hide()
-               elif feNumber == 0:
-                       self["NimB"].hide()
-                       self["NimA"].show()
-               elif feNumber == 1:
-                       self["NimA"].hide()
-                       self["NimB"].show()
-
-       def gotServiceEvent(self, ev):
-               service = self.session.nav.getCurrentService()
-               if ev == iPlayableService.evUpdatedInfo or ev == iPlayableService.evEnd:
-                       self.checkTunerState(service)
-####################################
-

 class InfoBarNotifications:
        def __init__(self):
                self.onExecBegin.append(self.checkNotifications)
 class InfoBarNotifications:
        def __init__(self):
                self.onExecBegin.append(self.checkNotifications)