X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1213cbcff4f8b31aa77825325f102a134d246e0a..cbdae9732240da8ae902936fd8819ffbbae2f1cf:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 8eb8b887..adc68945 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -75,7 +75,7 @@ class ChannelContextMenu(FixedMenu):
 		if cnt > 1: # show bouquet list
 			self.session.open(BouquetSelector, bouquets, self.addCurrentServiceToBouquet)
 		elif cnt == 1: # add to only one existing bouquet
-			self.addCurrentServiceToBouquet(bouquet[0][1])
+			self.addCurrentServiceToBouquet(bouquets[0][1])
 		else: #no bouquets in root.. so assume only one favourite list is used
 			self.addCurrentServiceToBouquet(self.csel.bouquet_root)
 
@@ -233,18 +233,21 @@ class ChannelSelectionEdit:
 	def doContext(self):
 		self.session.open(ChannelContextMenu, self)
 
+USE_MULTIBOUQUETS = False
+
 class ChannelSelectionBase(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
 		# this makes it much simple to implement a selectable radio or tv mode :)
 		self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17)'
-		self.service_types_radio = '1:7:1:0:0:0:0:0:0:0:(type == 2)'
+#		self.service_types_radio = '1:7:1:0:0:0:0:0:0:0:(type == 2)'
 
 		self.service_types = self.service_types_tv
-
-		#self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
-		self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+		if USE_MULTIBOUQUETS:
+			self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+		else:
+			self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
 
 		self["key_red"] = Button(_("All"))
 		self["key_green"] = Button(_("Satellites"))
@@ -258,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
@@ -266,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):
@@ -283,10 +294,15 @@ class ChannelSelectionBase(Screen):
 		return offsetCount
 
 	def setRootBase(self, root, justSet=False):
-		inBouquetRootList = root.getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
-		if not inBouquetRootList and (root.getPath().find('FROM BOUQUET') != -1):
+		path = root.getPath()
+		inBouquetRootList = path.find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
+		pos = path.find(' FROM BOUQUET')
+		isBouquet = pos != -1
+		if not inBouquetRootList and isBouquet:
 			self.servicelist.setMode(ServiceList.MODE_FAVOURITES)
 			self.servicelist.setNumberOffset(self.getBouquetNumOffset(root))
+			refstr = self.service_types + path[pos:]
+			root = eServiceReference(refstr)
 		else:
 			self.servicelist.setMode(ServiceList.MODE_NORMAL)
 		self.servicelist.setRoot(root, justSet)