ask to resume on playback

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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4c06661a3e9de4ff7aa8dbe8e917b45314baa23d..42a7eb827b249d63779ebddf808f49c0fbe4ddf4 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -322,11 +322,8 @@ class InfoBarChannelSelection:
                        if prev:
                                prev = prev.toString()
                                while True:
-                                       if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
-                                               if self.servicelist.atEnd():
-                                                       self.servicelist.nextBouquet()
-                                               else:
-                                                       self.servicelist.moveDown()
+                                       if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes" and self.servicelist.atEnd():
+                                               self.servicelist.nextBouquet()
                                        else:
                                                self.servicelist.moveDown()
                                        cur = self.servicelist.getCurrentSelection()
@@ -1446,6 +1443,7 @@ class InfoBarCueSheetSupport:
        CUT_TYPE_IN = 0
        CUT_TYPE_OUT = 1
        CUT_TYPE_MARK = 2
+       CUT_TYPE_LAST = 3
        
        def __init__(self):
                self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", 
@@ -1462,8 +1460,26 @@ class InfoBarCueSheetSupport:
                        })
 
        def __serviceStarted(self):
+               if self.is_closing:
+                       return
                print "new service started! trying to download cuts!"
                self.downloadCuesheet()
+               
+               last = None
+               
+               for (pts, what) in self.cut_list:
+                       if what == self.CUT_TYPE_LAST:
+                               last = pts
+                       
+               if last is not None:
+                       self.resume_point = last
+                       Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?"), timeout=10)
+       
+       def playLastCB(self, answer):
+               if answer == True:
+                       seekable = self.__getSeekable()
+                       if seekable is not None:
+                               seekable.seekTo(self.resume_point)
 
        def __getSeekable(self):
                service = self.session.nav.getCurrentService()