allow two different behaviours when going into resume: SUSPEND_STOPS (default as...

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index e7a4601e4718900498473a01e344fc7c0f3256f2..ce5fa9d262cd8f5687fe1db67d8bae31f12387d6 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -166,7 +166,7 @@ class ChapterZap(Screen):
                self.Timer.start(3000, True)
 
 class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport):
                self.Timer.start(3000, True)
 
 class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarPVRState, InfoBarShowHide, HelpableScreen, InfoBarCueSheetSupport):

-#      ALLOW_SUSPEND = True
+       ALLOW_SUSPEND = Screen.SUSPEND_PAUSES

        ENABLE_RESUME_SUPPORT = True
        
        skin = """
        ENABLE_RESUME_SUPPORT = True
        
        skin = """

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 2ba7342fb83480d193303027e221f8201a47fae6..7ac7841ca38bc20de7b098f5e2812593cc81ca90 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -9,6 +9,7 @@ from Components.GUIComponent import GUIComponent
 
 class Screen(dict, GUISkin):
 
 
 class Screen(dict, GUISkin):
 

+       False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)

        ALLOW_SUSPEND = False
 
        global_screen = None
        ALLOW_SUSPEND = False
 
        global_screen = None

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index d3767f33b363b1e59305e7f66be6ddce4320fc91..4a9dca4046fa7bbe0320cd0c600c836e5fa5c504 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -45,10 +45,17 @@ class Standby(Screen):
 
                #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()
+
+               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()
+                       self.paused_service = None
+               elif self.session.current_dialog.ALLOW_SUSPEND == Screen.SUSPEND_PAUSES:
+                       self.paused_service = self.session.current_dialog
+                       self.paused_service.pauseService()
+                       self.prev_running_service = None

                #set input to vcr scart
                if SystemInfo["ScartSwitch"]:
                        self.avswitch.setInput("SCART")
                #set input to vcr scart
                if SystemInfo["ScartSwitch"]:
                        self.avswitch.setInput("SCART")


@@ -63,6 +70,8 @@ class Standby(Screen):
        def __onClose(self):
                if self.prev_running_service:
                        self.session.nav.playService(self.prev_running_service)
        def __onClose(self):
                if self.prev_running_service:
                        self.session.nav.playService(self.prev_running_service)

+               elif self.paused_service:
+                       self.paused_service.unPauseService()

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