X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FChannelSelection.py;h=7ddbcbfa20dde5b9c8df8dc4feaab54e8a2b5d74;hp=e8bbce156e964fad10987bc5c7d63c4babf06cd9;hb=7ff2c7908114488178ad574b23fcee718515f4fb;hpb=9e205508ab4462cac81f7b85447c7ba907a59c99

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
old mode 100644
new mode 100755
index e8bbce1..7ddbcbf
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -22,6 +22,7 @@ from Components.Input import Input
 profile("ChannelSelection.py 3")
 from Components.ParentalControl import parentalControl
 from Components.ChoiceList import ChoiceList, ChoiceEntryComponent
+from Components.SystemInfo import SystemInfo
 from Screens.InputBox import InputBox, PinInput
 from Screens.MessageBox import MessageBox
 from Screens.ServiceInfo import ServiceInfo
@@ -30,7 +31,6 @@ from Screens.PictureInPicture import PictureInPicture
 from Screens.RdsDisplay import RassInteractive
 from ServiceReference import ServiceReference
 from Tools.BoundFunction import boundFunction
-from re import compile
 from os import remove
 profile("ChannelSelection.py after imports")
 
@@ -126,7 +126,7 @@ class ChannelContextMenu(Screen):
 					append_when_current_valid(current, menu, (_("remove entry"), self.removeCurrentService), level = 0)
 				if current_root and current_root.getPath().find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
 					append_when_current_valid(current, menu, (_("remove new found flag"), self.removeNewFoundFlag), level = 0)
-				if isPlayable:
+				if isPlayable and SystemInfo.get("NumVideoDecoders", 1) > 1:
 					append_when_current_valid(current, menu, (_("Activate Picture in Picture"), self.showServiceInPiP), level = 0, key = "blue")
 					self.pipAvailable = True
 			else:
@@ -208,7 +208,7 @@ class ChannelContextMenu(Screen):
 		if self.session.pip.playService(newservice):
 			self.session.pipshown = True
 			self.session.pip.servicePath = self.csel.getCurrentServicePath()
-			self.close()
+			self.close(True)
 		else:
 			self.session.pipshown = False
 			del self.session.pip
@@ -449,7 +449,7 @@ class ChannelSelectionEdit:
 				if mutableAlternatives:
 					mutableAlternatives.setListName(name)
 					if mutableAlternatives.addService(cur_service.ref):
-						print "add", cur_service.toString(), "to new alternatives failed"
+						print "add", cur_service.ref.toString(), "to new alternatives failed"
 					mutableAlternatives.flushChanges()
 					self.servicelist.addService(new_ref.ref, True)
 					self.servicelist.removeCurrent()
@@ -672,7 +672,11 @@ class ChannelSelectionEdit:
 			self.entry_marked = True
 
 	def doContext(self):
-		self.session.open(ChannelContextMenu, self)
+		self.session.openWithCallback(self.exitContext, ChannelContextMenu, self)
+		
+	def exitContext(self, close = False):
+		if close:
+			self.cancel()
 
 MODE_TV = 0
 MODE_RADIO = 1
@@ -708,6 +712,7 @@ class ChannelSelectionBase(Screen):
 		self.servicePathTV = [ ]
 		self.servicePathRadio = [ ]
 		self.servicePath = [ ]
+		self.rootChanged = False
 
 		self.mode = MODE_TV
 
@@ -814,6 +819,7 @@ class ChannelSelectionBase(Screen):
 		else:
 			self.servicelist.setMode(ServiceList.MODE_NORMAL)
 		self.servicelist.setRoot(root, justSet)
+		self.rootChanged = True
 		self.buildTitleString()
 
 	def removeModeStr(self, str):
@@ -1175,6 +1181,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		self.servicelist.setPlayableIgnoreService(eServiceReference())
 
 	def setMode(self):
+		self.rootChanged = True
 		self.restoreRoot()
 		lastservice=eServiceReference(self.lastservice.value)
 		if lastservice.valid():
@@ -1298,19 +1305,21 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 			self.lastroot.save()
 
 	def restoreRoot(self):
-		self.clearPath()
-		re = compile('.+?;')
-		tmp = re.findall(self.lastroot.value)
-		cnt = 0
-		for i in tmp:
-			self.servicePath.append(eServiceReference(i[:-1]))
-			cnt += 1
-		if cnt:
-			path = self.servicePath.pop()
-			self.enterPath(path)
-		else:
-			self.showFavourites()
-			self.saveRoot()
+		tmp = [x for x in self.lastroot.value.split(';') if x != '']
+		current = [x.toString() for x in self.servicePath]
+		if tmp != current or self.rootChanged:
+			self.clearPath()
+			cnt = 0
+			for i in tmp:
+				self.servicePath.append(eServiceReference(i))
+				cnt += 1
+			if cnt:
+				path = self.servicePath.pop()
+				self.enterPath(path)
+			else:
+				self.showFavourites()
+				self.saveRoot()
+			self.rootChanged = False
 
 	def preEnterPath(self, refstr):
 		if self.servicePath and self.servicePath[0] != eServiceReference(refstr):
@@ -1437,6 +1446,10 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 		#set previous tv service
 		self.close(None)
 
+	#	ikseong - for add bouquet
+	def cancel(self):
+		self.closeRadio()
+		
 	def __evServiceStart(self):
 		service = self.session.nav.getCurrentService()
 		if service:
@@ -1458,19 +1471,20 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 			config.radio.lastroot.save()
 
 	def restoreRoot(self):
-		self.clearPath()
-		re = compile('.+?;')
-		tmp = re.findall(config.radio.lastroot.value)
-		cnt = 0
-		for i in tmp:
-			self.servicePathRadio.append(eServiceReference(i[:-1]))
-			cnt += 1
-		if cnt:
-			path = self.servicePathRadio.pop()
-			self.enterPath(path)
-		else:
-			self.showFavourites()
-			self.saveRoot()
+		tmp = [x for x in config.radio.lastroot.value.split(';') if x != '']
+		current = [x.toString() for x in self.servicePath]
+		if tmp != current or self.rootChanged:
+			cnt = 0
+			for i in tmp:
+				self.servicePathRadio.append(eServiceReference(i))
+				cnt += 1
+			if cnt:
+				path = self.servicePathRadio.pop()
+				self.enterPath(path)
+			else:
+				self.showFavourites()
+				self.saveRoot()
+			self.rootChanged = False
 
 	def preEnterPath(self, refstr):
 		if self.servicePathRadio and self.servicePathRadio[0] != eServiceReference(refstr):