X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FChannelSelection.py;h=fc176a7baef558e122fa8d63eca432d52f6db37a;hp=c07e34954e4955bc1922e11d764475e460ce5286;hb=1d557af556c71a9c658deea9cec783a66903c136;hpb=5138dce8cfa3d4987ebc8899d5fd990883d1a1dc

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
old mode 100644
new mode 100755
index c07e349..fc176a7
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -65,6 +65,24 @@ class BouquetSelector(Screen):
 	def cancelClick(self):
 		self.close(False)
 
+class SilentBouquetSelector:
+	def __init__(self, bouquets, enableWrapAround=False, current=0):
+		self.bouquets = [b[1] for b in bouquets]
+		self.pos = current
+		self.count = len(bouquets)
+		self.enableWrapAround = enableWrapAround
+
+	def up(self):
+		if self.pos > 0 or self.enableWrapAround:
+			self.pos = (self.pos - 1) % self.count
+
+	def down(self):
+		if self.pos < (self.count - 1) or self.enableWrapAround:
+			self.pos = (self.pos + 1) % self.count
+
+	def getCurrent(self):
+		return self.bouquets[self.pos]
+
 # csel.bouquet_mark_edit values
 OFF = 0
 EDIT_BOUQUET = 1
@@ -213,6 +231,7 @@ class ChannelContextMenu(Screen):
 		if self.session.pipshown:
 			del self.session.pip
 		self.session.pip = self.session.instantiateDialog(PictureInPicture)
+		self.session.pip.setAnimationMode(0)
 		self.session.pip.show()
 		newservice = self.csel.servicelist.getCurrent()
 		if self.session.pip.playService(newservice):
@@ -700,8 +719,9 @@ MODE_RADIO = 1
 # type 27 = advanced codec HD NVOD reference service (NYI)
 # type 2 = digital radio sound service
 # type 10 = advanced codec digital radio sound service
+# type 31 = High Efficiency Video Coing digital television
 
-service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195)'
+service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 31) || (type == 134) || (type == 195)'
 service_types_radio = '1:7:2:0:0:0:0:0:0:0:(type == 2) || (type == 10)'
 
 class ChannelSelectionBase(Screen):
@@ -1056,7 +1076,13 @@ class ChannelSelectionBase(Screen):
 			self.servicelist.moveToChar(charstr[0])
 
 	def keyAsciiCode(self):
-		unichar = unichr(getPrevAsciiCode())
+		#unichar = unichr(getPrevAsciiCode())
+		from Components.config import getCharValue
+		unichar = getCharValue(getPrevAsciiCode())
+		if unichar is None:
+			return
+		if len(str(unichar)) > 1:
+			return
 		charstr = unichar.encode("utf-8")
 		if len(charstr) == 1:
 			self.servicelist.moveToChar(charstr[0])
@@ -1407,6 +1433,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 		self.onLayoutFinish.append(self.onCreate)
 
 		self.info = session.instantiateDialog(RadioInfoBar) # our simple infobar
+		self.info.setAnimationMode(0)
 
 		self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
 			{