remove standby

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

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index c8acd62061790f8244379b22222852b70008463c..d256d3e706ba0d5d22b6f26cab064204765ac47b 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -3,7 +3,8 @@ from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap
 from EpgSelection import EPGSelection
-from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr
+from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, eTimer
+from Components.config import config, configElement, ConfigSubsection, configText
 
 from Screens.FixedMenu import FixedMenu
 
@@ -59,8 +60,19 @@ class ChannelContextMenu(FixedMenu):
                self.close()
  
 class ChannelSelection(Screen):
+       def lastService(self):
+               self.lastServiceTimer.stop()
+               #zap to last running tv service
+               self.setRoot(eServiceReference(config.tv.lastroot.value))
+               self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
+       
        def __init__(self, session):
                Screen.__init__(self, session)
+
+               #config for lastservice
+               config.tv = ConfigSubsection();
+               config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
+               config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
                
                self.entry_marked = False
                self.movemode = False
@@ -75,10 +87,16 @@ class ChannelSelection(Screen):
                self["key_blue"] = Button("Favourites")
                
                self["list"] = ServiceList()
-               self.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
                
-               #self["okbutton"] = Button("ok", [self.channelSelected])
+               if config.tv.lastroot.value == "":
+                       self.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
                
+               #self["okbutton"] = Button("ok", [self.channelSelected])
+
+               self.lastServiceTimer = eTimer()
+               self.lastServiceTimer.timeout.get().append(self.lastService)
+               self.lastServiceTimer.start(100)
+
                class ChannelActionMap(ActionMap):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
@@ -167,6 +185,7 @@ class ChannelSelection(Screen):
                                        self.mutableList = list.startEdit()
                                else:
                                        self.mutableList = None
+                       self.saveRoot(root)
                        self["list"].setRoot(root)
 
        def clearMarks(self):
@@ -196,11 +215,13 @@ class ChannelSelection(Screen):
                        self.doMark()
                else:
                        self.session.nav.playService(ref)
+                       self.saveChannel()
                        self.close()
 
        #called from infoBar
        def zap(self):
                self.session.nav.playService(self["list"].getCurrent())
+               self.saveChannel()
 
        def moveUp(self):
                self["list"].moveUp()
@@ -224,3 +245,17 @@ class ChannelSelection(Screen):
                self.setRoot(eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'))
                list = self["list"]
                list.setMode(list.MODE_FAVOURITES)
+
+       def saveRoot(self, root):
+               if root is not None:
+                       config.tv.lastroot.value = root.toString()
+                       config.tv.lastroot.save()
+
+       def saveChannel(self):
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               if ref is not None:
+                       refstr = ref.toString()
+               else:
+                       refstr = ""
+               config.tv.lastservice.value = refstr
+               config.tv.lastservice.save()