From 03020757d9906f2b4fb42f61e9b96906185bab52 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 17 Oct 2009 14:09:47 +0200 Subject: [PATCH] cleanup grayout handling in servicelist.. so no more grayout in timeout channelselection and other channelselections based on simple channelselection --- .../SystemPlugins/CommonInterfaceAssignment/plugin.py | 6 ------ lib/service/listboxservice.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py index 48669c73..2c0edf53 100755 --- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py +++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py @@ -510,12 +510,6 @@ class myChannelSelection(ChannelSelectionBase): def __init__(self, session, title): ChannelSelectionBase.__init__(self, session) self.onShown.append(self.__onExecCallback) - service = self.session.nav.getCurrentService() - if service: - info = service.info() - if info: - refstr = info.getInfoString(iServiceInformation.sServiceref) - self.servicelist.setPlayableIgnoreService(eServiceReference(refstr)) self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions", "ChannelSelectBaseActions"], { diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index a2c6b8fe..05aaf731 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -528,7 +528,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const eServiceReference ref = *m_cursor; bool isPlayable = !(ref.flags & eServiceReference::isDirectory || ref.flags & eServiceReference::isMarker); - if (!marked && isPlayable && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) + if (!marked && isPlayable && service_info && m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) { if (m_color_set[serviceNotAvail]) painter.setForegroundColor(m_color[serviceNotAvail]); -- 2.30.2