restart previous running services in onClose event

remove some debug output

diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
index 7ebc42b5176ddb50a278e77b1b5d828ec2a9e60f..c345667597bd99994daf94cdb66ec6ea47734785 100644 (file)
--- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py
+++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
@@ -213,6 +213,10 @@ class CutListEditor(Screen, InfoBarBase, InfoBarSeek, InfoBarCueSheetSupport, He
                # to track new entries we save the last version of the cutlist
                self.last_cuts = [ ]
                self.cut_start = None
                # to track new entries we save the last version of the cutlist
                self.last_cuts = [ ]
                self.cut_start = None

+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.old_service)

 
        def showTutorial(self):
                if not self.tutorial_seen:
 
        def showTutorial(self):
                if not self.tutorial_seen:


@@ -258,7 +262,6 @@ Then seek to the end, press OK, select 'end cut'. That's it.
                        self.removeMark(m)
 
        def exit(self):
                        self.removeMark(m)
 
        def exit(self):

-               self.session.nav.playService(self.old_service)

                self.close()
 
        def getCutlist(self):
                self.close()
 
        def getCutlist(self):

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 90de8b2fbca7ed7da446b95b32bf490a4b4805cd..4ade7fe0a6e1828afa7218e7d150cf543098df05 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -125,15 +125,20 @@ class PositionerSetup(Screen):
                self.statusTimer = eTimer()
                self.statusTimer.callback.append(self.updateStatus)
                self.statusTimer.start(50, False)
                self.statusTimer = eTimer()
                self.statusTimer.callback.append(self.updateStatus)
                self.statusTimer.start(50, False)

+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.oldref)

 
        def restartPrevService(self, yesno):
                if yesno:
                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel
 
        def restartPrevService(self, yesno):
                if yesno:
                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel

-                       self.session.nav.playService(self.oldref)
-               self.close(None)
-       
+               else:
+                       self.oldref=None
+               self.close(None)        
+

        def keyCancel(self):
                if self.oldref:
                        self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before positioner setup?"), MessageBox.TYPE_YESNO)
        def keyCancel(self):
                if self.oldref:
                        self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before positioner setup?"), MessageBox.TYPE_YESNO)

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 906504069fe167f2617bfc19e4625c0b88e63cdd..d6d967d25742b8f1bba8bd46206ac9b87355be2f 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -115,6 +115,10 @@ class Satfinder(ScanSetup):
                self["introduction"].setText("")
                self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)
                self.initcomplete = True
                self["introduction"].setText("")
                self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)
                self.initcomplete = True

+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.oldref)

 
        def createSetup(self):
                self.typeOfTuningEntry = None
 
        def createSetup(self):
                self.typeOfTuningEntry = None


@@ -227,7 +231,8 @@ class Satfinder(ScanSetup):
                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel
                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel

-                       self.session.nav.playService(self.oldref)
+               else:
+                       self.oldref = None

                self.close(None)
 
        def keyCancel(self):
                self.close(None)
 
        def keyCancel(self):

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 64ae5492e5604d70e13d61c6ca81edd1ac7490d5..2fd3bd8b28e9a7e138cdf04240919a6e7482199d 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -1371,6 +1371,11 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                },-1)
                self["RdsActions"].setEnabled(False)
                infobar.rds_display.onRassInteractivePossibilityChanged.append(self.RassInteractivePossibilityChanged)
                },-1)
                self["RdsActions"].setEnabled(False)
                infobar.rds_display.onRassInteractivePossibilityChanged.append(self.RassInteractivePossibilityChanged)

+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               lastservice=eServiceReference(config.tv.lastservice.value)
+               self.session.nav.playService(lastservice)

 
        def startRassInteractive(self):
                self.info.hide();
 
        def startRassInteractive(self):
                self.info.hide();


@@ -1389,8 +1394,6 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                self.infobar.rds_display.onRassInteractivePossibilityChanged.remove(self.RassInteractivePossibilityChanged)
                self.info.hide()
                #set previous tv service
                self.infobar.rds_display.onRassInteractivePossibilityChanged.remove(self.RassInteractivePossibilityChanged)
                self.info.hide()
                #set previous tv service

-               lastservice=eServiceReference(config.tv.lastservice.value)
-               self.session.nav.playService(lastservice)

                self.close(None)
 
        def __evServiceStart(self):
                self.close(None)
 
        def __evServiceStart(self):

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 8f400d240ff193faacb8a35549e4c61aa880ad43..05c5c98a91d0b27b17653d2c8d976a14843163ab 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -152,6 +152,10 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
                self.returning = False
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
                self.returning = False

+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.lastservice)

 
        def leavePlayer(self):
                self.is_closing = True
 
        def leavePlayer(self):
                self.is_closing = True


@@ -171,14 +175,12 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
        def leavePlayerConfirmed(self, answer):
                answer = answer and answer[1]
                if answer == "quit":
        def leavePlayerConfirmed(self, answer):
                answer = answer and answer[1]
                if answer == "quit":

-                       self.session.nav.playService(self.lastservice)

                        config.movielist.last_videodir.cancel()
                        self.close()
                elif answer == "movielist":
                        ref = self.session.nav.getCurrentlyPlayingServiceReference()
                        self.returning = True
                        self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
                        config.movielist.last_videodir.cancel()
                        self.close()
                elif answer == "movielist":
                        ref = self.session.nav.getCurrentlyPlayingServiceReference()
                        self.returning = True
                        self.session.openWithCallback(self.movieSelected, MovieSelection, ref)

-                       self.session.nav.playService(self.lastservice)

                elif answer == "restart":
                        self.doSeek(0)
 
                elif answer == "restart":
                        self.doSeek(0)
 

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2227f8b99e4ea414a328b0ddf96eed889220d96c..85f342003be3674a3e322ee1f6f260805425f755 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -730,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


@@ -1170,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


@@ -1179,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):

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 4cda9d190cf1e80bfa45619f4cae9275e1061da1..f7c819de8da932ff501b050995e3e8dc8328e182 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -12,8 +12,6 @@ class Standby(Screen):
                #set input to encoder
                self.avswitch.setInput("ENCODER")
                #restart last played service
                #set input to encoder
                self.avswitch.setInput("ENCODER")
                #restart last played service

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

                #unmute adc
                self.leaveMute()
                #set brightness of lcd
                #unmute adc
                self.leaveMute()
                #set brightness of lcd


@@ -56,6 +54,11 @@ class Standby(Screen):
                config.lcd.standby.apply()
                self.onShow.append(self.__onShow)
                self.onHide.append(self.__onHide)
                config.lcd.standby.apply()
                self.onShow.append(self.__onShow)
                self.onHide.append(self.__onHide)

+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               if self.prev_running_service:
+                       self.session.nav.playService(self.prev_running_service)

 
        def createSummary(self):
                return StandbySummary
 
        def createSummary(self):
                return StandbySummary

diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py
index 84c8317cc34d43a8343c615b20f09cdad1deb4b7..24af517dbc4fd072ea9d02b0ef7f6c23e9bed2f5 100644 (file)
--- a/lib/python/Screens/SubservicesQuickzap.py
+++ b/lib/python/Screens/SubservicesQuickzap.py
@@ -46,6 +46,11 @@ class SubservicesQuickzap(InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarInst
                                "9": self.keyNumberGlobal,
                                "0": self.keyNumberGlobal
                        }, 0)
                                "9": self.keyNumberGlobal,
                                "0": self.keyNumberGlobal
                        }, 0)

+               
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.restoreService, False)

 
        def onLayoutFinished(self):
                self.timer.start(0,True)
 
        def onLayoutFinished(self):
                self.timer.start(0,True)


@@ -113,7 +118,6 @@ class SubservicesQuickzap(InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarInst
        
        def quit(self, answer):
                if answer:
        
        def quit(self, answer):
                if answer:

-                       self.session.nav.playService(self.restoreService, False)

                        self.close()
                
        def playSubservice(self, number = 0):
                        self.close()
                
        def playSubservice(self, number = 0):