git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for radio mode
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index fd57f4c0d651e0468677a53fee3d4a2670214c5c..7f5e10227a0da7b95565be1e98cf8572af0c1b38 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-416,10
+416,14
@@
class ChannelSelectionBase(Screen):
def pathUp(self, justSet=False):
if self.mode == MODE_TV:
def pathUp(self, justSet=False):
if self.mode == MODE_TV:
+ print "MODE_TV"
prev = self.servicePathTV.pop()
prev = self.servicePathTV.pop()
+ print "prev", prev.toString()
length = len(self.servicePathTV)
length = len(self.servicePathTV)
+ print "length", length
if length:
current = self.servicePathTV[length-1]
if length:
current = self.servicePathTV[length-1]
+ print "current", current.toString()
else:
prev = self.servicePathRadio.pop()
length = len(self.servicePathRadio)
else:
prev = self.servicePathRadio.pop()
length = len(self.servicePathRadio)
@@
-427,6
+431,7
@@
class ChannelSelectionBase(Screen):
current = self.servicePathRadio[length-1]
self.setRoot(current, justSet)
if not justSet:
current = self.servicePathRadio[length-1]
self.setRoot(current, justSet)
if not justSet:
+ print "setCurrentSelection prev"
self.setCurrentSelection(prev)
return prev
self.setCurrentSelection(prev)
return prev
@@
-520,8
+525,10
@@
class ChannelSelectionBase(Screen):
if not self.pathChangedDisabled:
if not self.preEnterPath(self.bouquet_rootstr):
if self.isBasePathEqual(self.bouquet_root):
if not self.pathChangedDisabled:
if not self.preEnterPath(self.bouquet_rootstr):
if self.isBasePathEqual(self.bouquet_root):
+ print "basepath equal"
self.pathUp()
else:
self.pathUp()
else:
+ print "basepath not equal"
currentRoot = self.getRoot()
if currentRoot is None or currentRoot != self.bouquet_root:
self.clearPath()
currentRoot = self.getRoot()
if currentRoot is None or currentRoot != self.bouquet_root:
self.clearPath()
@@
-543,7
+550,10
@@
class ChannelSelectionBase(Screen):
servicepath = service.getPath()
pos = servicepath.find(" FROM BOUQUET")
if pos != -1:
servicepath = service.getPath()
pos = servicepath.find(" FROM BOUQUET")
if pos != -1:
- servicepath = '(type == 1)' + servicepath[pos:]
+ if self.mode == MODE_TV:
+ servicepath = '(type == 1)' + servicepath[pos:]
+ else:
+ servicepath = '(type == 2)' + servicepath[pos:]
service.setPath(servicepath)
self.servicelist.setCurrent(service)
service.setPath(servicepath)
self.servicelist.setCurrent(service)