From 3231871212cf3d33e4c4322d8912eb20702a80d4 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Thu, 27 Apr 2006 10:44:22 +0000 Subject: [PATCH] changes for identify -C and -T services --- lib/dvb/frontend.cpp | 4 ++++ lib/python/Screens/ChannelSelection.py | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index bb6b8b59..51d21105 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -292,7 +292,11 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const return 0; } case iDVBFrontend::feCable: + hash = 0xFFFF0000; + return 0; case iDVBFrontend::feTerrestrial: + hash = 0xEEEE0000; + return 0; default: return -1; } diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 32c3b107..83962e07 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -701,12 +701,17 @@ class ChannelSelectionBase(Screen): service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos))) service.setName(service_name) # why we need this cast? except: - if orbpos > 1800: # west - orbpos = 3600 - orbpos - h = _("W") + if orbpos == 0xFFFF0000: #Cable + n = ("%s (%s)") % (service_name, _("Cable")) + elif orbpos == 0xEEEE0000: #Terrestrial + n = ("%s (%s)") % (service_name, _("Terrestrial")) else: - h = _("E") - n = ("%s (%d.%d" + h + ")") % (service_name, orbpos / 10, orbpos % 10) + if orbpos > 1800: # west + orbpos = 3600 - orbpos + h = _("W") + else: + h = _("E") + n = ("%s (%d.%d" + h + ")") % (service_name, orbpos / 10, orbpos % 10) service.setName(n) self.servicelist.addService(service) self.servicelist.finishFill() -- 2.30.2