diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-03-28 14:35:26 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-03-28 14:35:26 +0000 |
| commit | a88fdd830c7de538c6b64168a245b3273d2a2145 (patch) | |
| tree | 19301b73035cd73aa9d815164c261cb90b6d85da /lib/python/Screens/ChannelSelection.py | |
| parent | d5b514d162f61ef13799843a7b65d6f495f396bd (diff) | |
| download | enigma2-a88fdd830c7de538c6b64168a245b3273d2a2145.tar.gz enigma2-a88fdd830c7de538c6b64168a245b3273d2a2145.zip | |
no service type filtering in bouquets by default (but its possible to set
filters in bouquets.tv/radio with (type == XYZ)
Diffstat (limited to 'lib/python/Screens/ChannelSelection.py')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index b38d3681..77991d00 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -420,10 +420,10 @@ class ChannelSelectionEdit: if mutableBouquetList: if self.mode == MODE_TV: bName += " (TV)" - str = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25) || (type == 134) FROM BOUQUET \"userbouquet.%s.tv\" ORDER BY bouquet'%(self.buildBouquetID(bName)) + str = '1:7:1:0:0:0:0:0:0:0:FROM BOUQUET \"userbouquet.%s.tv\" ORDER BY bouquet'%(self.buildBouquetID(bName)) else: bName += " (Radio)" - str = '1:7:2:0:0:0:0:0:0:0:(type == 2) FROM BOUQUET \"userbouquet.%s.radio\" ORDER BY bouquet'%(self.buildBouquetID(bName)) + str = '1:7:2:0:0:0:0:0:0:0:FROM BOUQUET \"userbouquet.%s.radio\" ORDER BY bouquet'%(self.buildBouquetID(bName)) new_bouquet_ref = eServiceReference(str) if not mutableBouquetList.addService(new_bouquet_ref): mutableBouquetList.flushChanges() @@ -997,14 +997,6 @@ class ChannelSelectionBase(Screen): return self.servicelist.getCurrent() def setCurrentSelection(self, service): - servicepath = service.getPath() - pos = servicepath.find(" FROM BOUQUET") - if pos != -1: - if self.mode == MODE_TV: - servicepath = '(type == 1) || (type == 17) || (type == 195) || (type == 25) || (type == 134)' + servicepath[pos:] - else: - servicepath = '(type == 2)' + servicepath[pos:] - service.setPath(servicepath) self.servicelist.setCurrent(service) def getBouquetList(self): |