diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 10 | ||||
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index dd20e1c9..adc68945 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -261,7 +261,15 @@ class ChannelSelectionBase(Screen): self.numericalTextInput = NumericalTextInput() + def appendDVBTypes(self, ref): + path = ref.getPath() + pos = path.find(' FROM BOUQUET') + if pos != -1: + return eServiceReference(self.service_types + path[pos:]) + return ref + def getBouquetNumOffset(self, bouquet): + bouquet = self.appendDVBTypes(bouquet) if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK return 0 offsetCount = 0 @@ -269,7 +277,7 @@ class ChannelSelectionBase(Screen): bouquetlist = serviceHandler.list(self.bouquet_root) if not bouquetlist is None: while True: - bouquetIterator = bouquetlist.getNext() + bouquetIterator = self.appendDVBTypes(bouquetlist.getNext()) if not bouquetIterator.valid() or bouquetIterator == bouquet: #end of list or bouquet found break if ((bouquetIterator.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory): diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 393f6901..0b2f6d0c 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -292,7 +292,7 @@ class InfoBarNumberZap: bouquetlist = serviceHandler.list(bouquet) if not bouquetlist is None: while number: - bouquet = bouquetlist.getNext() + bouquet = self.servicelist.appendDVBTypes(bouquetlist.getNext()) if not bouquet.valid(): #check end of list break if ((bouquet.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory): |