fix marking non playable services in channellist

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

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index ae344dcce554f215338aec7458f29da372937e74..03182ab82526d358e9eeedd4b711efda87baaa72 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -364,6 +364,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
                                "0": self.keyNumberGlobal
                        })
                self["actions"].csel = self
                                "0": self.keyNumberGlobal
                        })
                self["actions"].csel = self

+               self.onShown.append(self.onShow)
+
+       def onShow(self):
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               if ref.valid() and ref.getPath() == "":
+                       self.servicelist.setPlayableIgnoreService(ref)
+               else:
+                       self.servicelist.setPlayableIgnoreService(eServiceReference())

 
        def showEPGList(self):
                ref=self.servicelist.getCurrent()
 
        def showEPGList(self):
                ref=self.servicelist.getCurrent()


@@ -430,6 +438,9 @@ class SimpleChannelSelection(ChannelSelectionBase):
                                "cancel": self.cancel,
                                "ok": self.channelSelected,
                                "showFavourites": self.showFavourites,
                                "cancel": self.cancel,
                                "ok": self.channelSelected,
                                "showFavourites": self.showFavourites,

+                               "showAllServices": self.showAllServices,
+                               "showProviders": self.showProviders,
+                               "showSatellites": self.showSatellites,

                                "1": self.keyNumberGlobal,
                                "2": self.keyNumberGlobal,
                                "3": self.keyNumberGlobal,
                                "1": self.keyNumberGlobal,
                                "2": self.keyNumberGlobal,
                                "3": self.keyNumberGlobal,


@@ -445,6 +456,7 @@ class SimpleChannelSelection(ChannelSelectionBase):
 
        def onExecCallback(self):
                print "onExecCallback"
 
        def onExecCallback(self):
                print "onExecCallback"

+               self.showFavourites()

                self.session.currentDialog.instance.setTitle(self.title)
 
        def channelSelected(self): # just return selected service
                self.session.currentDialog.instance.setTitle(self.title)
 
        def channelSelected(self): # just return selected service