Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

	lib/dvb/decoder.cpp

5 files changed, 158 insertions, 25 deletions

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 2b60924c..0d238b30 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -126,6 +126,9 @@ def resolveFilename(scope, base = "", path_prefix = None):
 def pathExists(path):
 	return os_path.exists(path)
 
+def isMount(path):
+	return os_path.ismount(path)
+
 def createDir(path, makeParents = False):
 	try:
 		if makeParents:
diff --git a/lib/python/Tools/LoadPixmap.py b/lib/python/Tools/LoadPixmap.py
index 53e04e54..fff414ad 100644
--- a/lib/python/Tools/LoadPixmap.py
+++ b/lib/python/Tools/LoadPixmap.py
@@ -14,7 +14,7 @@ def LoadPixmap(path, desktop = None, cached = False):
 		alpha = loadPNG(path + "a.png")
 		ptr = loadJPG(path + "rgb.jpg", alpha)
 	else:
-		raise "neither .png nor .jpg, please fix file extension"
+		raise Exception("neither .png nor .jpg, please fix file extension")
 	if ptr and desktop:
 		desktop.makeCompatiblePixmap(ptr)
 
diff --git a/lib/python/Tools/Makefile.am b/lib/python/Tools/Makefile.am
index 609f3bab..5617cb66 100644
--- a/lib/python/Tools/Makefile.am
+++ b/lib/python/Tools/Makefile.am
@@ -4,4 +4,4 @@ install_PYTHON = \
 	FuzzyDate.py XMLTools.py Directories.py NumericalTextInput.py \
 	KeyBindings.py BoundFunction.py ISO639.py Notifications.py __init__.py \
 	RedirectOutput.py DreamboxHardware.py Import.py Event.py CList.py \
-	LoadPixmap.py Profile.py HardwareInfo.py
+	LoadPixmap.py Profile.py HardwareInfo.py Transponder.py
diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py
index 5954c9c3..c5576405 100644
--- a/lib/python/Tools/NumericalTextInput.py
+++ b/lib/python/Tools/NumericalTextInput.py
@@ -1,44 +1,65 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 from enigma import eTimer
 from Components.Language import language
 
 class NumericalTextInput:
-	def __init__(self, nextFunc=None, handleTimeout = True):
+	def __init__(self, nextFunc=None, handleTimeout = True, search = False):
 		self.mapping = []
 		self.lang = language.getLanguage()
 		self.useableChars=None
 		self.nextFunction=nextFunc
-		
+
+		if handleTimeout:
+			self.timer = eTimer()
+			self.timer.callback.append(self.timeout)
+		else:
+			self.timer = None
+		self.lastKey = -1
+		self.pos = -1
+
+		if search:
+			self.mapping.append (u"%_0") # 0
+			self.mapping.append (u" 1") # 1
+			self.mapping.append (u"abc2") # 2
+			self.mapping.append (u"def3") # 3
+			self.mapping.append (u"ghi4") # 4
+			self.mapping.append (u"jkl5") # 5
+			self.mapping.append (u"mno6") # 6
+			self.mapping.append (u"pqrs7") # 7
+			self.mapping.append (u"tuv8") # 8
+			self.mapping.append (u"wxyz9") # 9
+			return
+
 		if self.lang == 'de_DE':
 			self.mapping.append (u".,?'+\"0-()@/:_$!") # 0
 			self.mapping.append (u" 1") # 1
-			self.mapping.append (u"a�bc2A�BC") # 2
+			self.mapping.append (u"aäbc2AÄBC") # 2
 			self.mapping.append (u"def3DEF") # 3
 			self.mapping.append (u"ghi4GHI") # 4
 			self.mapping.append (u"jkl5JKL") # 5
-			self.mapping.append (u"mno�6MNO�") # 6
-			self.mapping.append (u"pqrs�7PQRS�") # 7
-			self.mapping.append (u"tu�v8TU�V") # 8
+			self.mapping.append (u"mnoö6MNOÖ") # 6
+			self.mapping.append (u"pqrsß7PQRSß") # 7
+			self.mapping.append (u"tuüv8TUÜV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 		elif self.lang == 'es_ES':
 			self.mapping.append (u".,?'+\"0-()@/:_$!") # 0
 			self.mapping.append (u" 1") # 1
-			self.mapping.append (u"abc��2ABC��") # 2
-			self.mapping.append (u"de��f3DEF��") # 3
-			self.mapping.append (u"ghi��4GHI��") # 4
+			self.mapping.append (u"abcáà2ABCÁÀ") # 2
+			self.mapping.append (u"deéèf3DEFÉÈ") # 3
+			self.mapping.append (u"ghiíì4GHIÍÌ") # 4
 			self.mapping.append (u"jkl5JKL") # 5
-			self.mapping.append (u"mn�o��6MN�O��") # 6
+			self.mapping.append (u"mnñoóò6MNÑOÓÒ") # 6
 			self.mapping.append (u"pqrs7PQRS") # 7
-			self.mapping.append (u"tuv��8TUV��") # 8
+			self.mapping.append (u"tuvúù8TUVÚÙ") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 		if self.lang in ['sv_SE', 'fi_FI']:
 			self.mapping.append (u".,?'+\"0-()@/:_$!") # 0
 			self.mapping.append (u" 1") # 1
-			self.mapping.append (u"abc��2ABC��") # 2
-			self.mapping.append (u"def�3DEF�") # 3
+			self.mapping.append (u"abcåä2ABCÅÄ") # 2
+			self.mapping.append (u"defé3DEFÉ") # 3
 			self.mapping.append (u"ghi4GHI") # 4
 			self.mapping.append (u"jkl5JKL") # 5
-			self.mapping.append (u"mno�6MNO�") # 6
+			self.mapping.append (u"mnoö6MNOÖ") # 6
 			self.mapping.append (u"pqrs7PQRS") # 7
 			self.mapping.append (u"tuv8TUV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
@@ -54,14 +75,6 @@ class NumericalTextInput:
 			self.mapping.append (u"tuv8TUV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 
-		if handleTimeout:
-			self.timer = eTimer()
-			self.timer.callback.append(self.timeout)
-		else:
-			self.timer = None
-		self.lastKey = -1
-		self.pos = -1
-
 	def setUseableChars(self, useable):
 		self.useableChars = useable
 
diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py
new file mode 100644
index 00000000..f37603c5
--- /dev/null
+++ b/lib/python/Tools/Transponder.py
@@ -0,0 +1,117 @@
+from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial
+
+def ConvertToHumanReadable(tp):
+	ret = { }
+	type = tp.get("tuner_type", "None")
+	if type == "DVB-S":
+		ret["tuner_type"] = _("Satellite")
+		ret["inversion"] = {
+			eDVBFrontendParametersSatellite.Inversion_Unknown : _("Auto"),
+			eDVBFrontendParametersSatellite.Inversion_On : _("On"),
+			eDVBFrontendParametersSatellite.Inversion_Off : _("Off")}[tp["inversion"]]
+		ret["fec_inner"] = {
+			eDVBFrontendParametersSatellite.FEC_None : _("None"),
+			eDVBFrontendParametersSatellite.FEC_Auto : _("Auto"),
+			eDVBFrontendParametersSatellite.FEC_1_2 : "1/2",
+			eDVBFrontendParametersSatellite.FEC_2_3 : "2/3",
+			eDVBFrontendParametersSatellite.FEC_3_4 : "3/4",
+			eDVBFrontendParametersSatellite.FEC_5_6 : "5/6",
+			eDVBFrontendParametersSatellite.FEC_7_8 : "7/8",
+			eDVBFrontendParametersSatellite.FEC_3_5 : "3/5",
+			eDVBFrontendParametersSatellite.FEC_4_5 : "4/5",
+			eDVBFrontendParametersSatellite.FEC_8_9 : "8/9",
+			eDVBFrontendParametersSatellite.FEC_9_10 : "9/10"}[tp["fec_inner"]]
+		ret["modulation"] = {
+			eDVBFrontendParametersSatellite.Modulation_Auto : _("Auto"),
+			eDVBFrontendParametersSatellite.Modulation_QPSK : "QPSK",
+			eDVBFrontendParametersSatellite.Modulation_QAM16 : "QAM16",
+			eDVBFrontendParametersSatellite.Modulation_8PSK : "8PSK"}[tp["modulation"]]
+		ret["polarization"] = {
+			eDVBFrontendParametersSatellite.Polarisation_Horizontal : _("Horizontal"),
+			eDVBFrontendParametersSatellite.Polarisation_Vertical : _("Vertical"),
+			eDVBFrontendParametersSatellite.Polarisation_CircularLeft : _("Circular left"),
+			eDVBFrontendParametersSatellite.Polarisation_CircularRight : _("Circular right")}[tp["polarization"]]
+		ret["system"] = {
+			eDVBFrontendParametersSatellite.System_DVB_S : "DVB-S",
+			eDVBFrontendParametersSatellite.System_DVB_S2 : "DVB-S2"}[tp["system"]]
+		if ret["system"] == "DVB-S2":
+			ret["rolloff"] = {
+				eDVBFrontendParametersSatellite.RollOff_alpha_0_35 : "0.35",
+				eDVBFrontendParametersSatellite.RollOff_alpha_0_25 : "0.25",
+				eDVBFrontendParametersSatellite.RollOff_alpha_0_20 : "0.20"}[tp["rolloff"]]
+			ret["pilot"] = {
+				eDVBFrontendParametersSatellite.Pilot_Unknown : _("Auto"),
+				eDVBFrontendParametersSatellite.Pilot_On : _("On"),
+				eDVBFrontendParametersSatellite.Pilot_Off : _("Off")}[tp["pilot"]]
+	elif type == "DVB-C":
+		ret["tuner_type"] = _("Cable")
+		ret["modulation"] = {
+			eDVBFrontendParametersCable.Modulation_Auto: _("Auto"),
+			eDVBFrontendParametersCable.Modulation_QAM16 : "QAM16",
+			eDVBFrontendParametersCable.Modulation_QAM32 : "QAM32",
+			eDVBFrontendParametersCable.Modulation_QAM64 : "QAM64",
+			eDVBFrontendParametersCable.Modulation_QAM128 : "QAM128",
+			eDVBFrontendParametersCable.Modulation_QAM256 : "QAM256"}[tp["modulation"]]
+		ret["inversion"] = {
+			eDVBFrontendParametersCable.Inversion_Unknown : _("Auto"),
+			eDVBFrontendParametersCable.Inversion_On : _("On"),
+			eDVBFrontendParametersCable.Inversion_Off : _("Off")}[tp["inversion"]]
+		ret["fec_inner"] = {
+			eDVBFrontendParametersCable.FEC_None : _("None"),
+			eDVBFrontendParametersCable.FEC_Auto : _("Auto"),
+			eDVBFrontendParametersCable.FEC_1_2 : "1/2",
+			eDVBFrontendParametersCable.FEC_2_3 : "2/3",
+			eDVBFrontendParametersCable.FEC_3_4 : "3/4",
+			eDVBFrontendParametersCable.FEC_5_6 : "5/6",
+			eDVBFrontendParametersCable.FEC_7_8 : "7/8",
+			eDVBFrontendParametersCable.FEC_8_9 : "8/9"}[tp["fec_inner"]]
+	elif type == "DVB-T":
+		ret["tuner_type"] = _("Terrestrial")
+		ret["bandwidth"] = {
+			eDVBFrontendParametersTerrestrial.Bandwidth_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.Bandwidth_8MHz : "8 MHz",
+			eDVBFrontendParametersTerrestrial.Bandwidth_7MHz : "7 MHz",
+			eDVBFrontendParametersTerrestrial.Bandwidth_6MHz : "6 MHz"}[tp["bandwidth"]]
+		ret["code_rate_lp"] = {
+			eDVBFrontendParametersTerrestrial.FEC_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.FEC_1_2 : "1/2",
+			eDVBFrontendParametersTerrestrial.FEC_2_3 : "2/3",
+			eDVBFrontendParametersTerrestrial.FEC_3_4 : "3/4",
+			eDVBFrontendParametersTerrestrial.FEC_5_6 : "5/6",
+			eDVBFrontendParametersTerrestrial.FEC_7_8 : "7/8"}[tp["code_rate_lp"]]
+		ret["code_rate_hp"] = {
+			eDVBFrontendParametersTerrestrial.FEC_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.FEC_1_2 : "1/2",
+			eDVBFrontendParametersTerrestrial.FEC_2_3 : "2/3",
+			eDVBFrontendParametersTerrestrial.FEC_3_4 : "3/4",
+			eDVBFrontendParametersTerrestrial.FEC_5_6 : "5/6",
+			eDVBFrontendParametersTerrestrial.FEC_7_8 : "7/8"}[tp["code_rate_hp"]]
+		ret["constellation"] = {
+			eDVBFrontendParametersTerrestrial.Modulation_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.Modulation_QPSK : "QPSK",
+			eDVBFrontendParametersTerrestrial.Modulation_QAM16 : "QAM16",
+			eDVBFrontendParametersTerrestrial.Modulation_QAM64 : "QAM64"}[tp["constellation"]]
+		ret["transmission_mode"] = {
+			eDVBFrontendParametersTerrestrial.TransmissionMode_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.TransmissionMode_2k : "2k",
+			eDVBFrontendParametersTerrestrial.TransmissionMode_8k : "8k"}[tp["transmission_mode"]]
+		ret["guard_interval"] = {
+			eDVBFrontendParametersTerrestrial.GuardInterval_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.GuardInterval_1_32 : "1/32",
+			eDVBFrontendParametersTerrestrial.GuardInterval_1_16 : "1/16",
+			eDVBFrontendParametersTerrestrial.GuardInterval_1_8 : "1/8",
+			eDVBFrontendParametersTerrestrial.GuardInterval_1_4 : "1/4"}[tp["guard_interval"]]
+		ret["hierarchy_information"] = {
+			eDVBFrontendParametersTerrestrial.Hierarchy_Auto : _("Auto"),
+			eDVBFrontendParametersTerrestrial.Hierarchy_None : _("None"),
+			eDVBFrontendParametersTerrestrial.Hierarchy_1 : "1",
+			eDVBFrontendParametersTerrestrial.Hierarchy_2 : "2",
+			eDVBFrontendParametersTerrestrial.Hierarchy_4 : "4"}[tp["hierarchy_information"]]
+		ret["inversion"] = {
+			eDVBFrontendParametersTerrestrial.Inversion_Unknown : _("Auto"),
+			eDVBFrontendParametersTerrestrial.Inversion_On : _("On"),
+			eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]]
+	for x in tp.keys():
+		if not ret.has_key(x):
+			ret[x] = tp[x]
+	return ret