remove nested structures because of the fact that swig cannot handle this

now we no more need the bad duplicate definitions of eDVBFrontendParametersSatellite/Cables/Terrestrial content
i.e. eDVBFrontendParametersSatellite.System_DVB_S or eDVBFrontendParametersSatellite.FEC_Auto....

1 files changed, 11 insertions, 21 deletions

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index d3714440..69ef3774 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -478,14 +478,14 @@ class TunerScreen(ScanSetup):
 				self.list.append(self.systemEntry)
 			else:
 				# downgrade to dvb-s, in case a -s2 config was active
-				self.scan_sat.system.value = "dvb-s"
+				self.scan_sat.system.value = eDVBFrontendParametersSatellite.System_DVB_S
 			self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency))
 			self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion))
 			self.list.append(getConfigListEntry(_('Symbol Rate'), self.scan_sat.symbolrate))
 			self.list.append(getConfigListEntry(_("Polarity"), self.scan_sat.polarization))
-			if self.scan_sat.system.value == "dvb-s":
+			if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S:
 				self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
-			elif self.scan_sat.system.value == "dvb-s2":
+			elif self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S2:
 				self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec_s2))
 				self.modulationEntry = getConfigListEntry(_('Modulation'), self.scan_sat.modulation)
 				self.list.append(self.modulationEntry)
@@ -570,31 +570,21 @@ class TunerScreen(ScanSetup):
 		returnvalue = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 		satpos = int(tuning.sat.value)
 		if tuning.type.value == "manual_transponder":
-			if self.scan_sat.system.value == "dvb-s2":
+			if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S2:
 				fec = self.scan_sat.fec_s2.value
 			else:
 				fec = self.scan_sat.fec.value
 			returnvalue = (
 				self.scan_sat.frequency.value,
 				self.scan_sat.symbolrate.value,
-				self.scan_sat.polarization.index,
-				{ "auto": 0,
-				   "1_2": 1,
-				   "2_3": 2,
-				   "3_4": 3,
-				   "5_6": 4,
-				   "7_8": 5,
-				   "8_9": 6,
-				   "3_5": 7,
-				   "4_5": 8,
-				   "9_10": 9,
-				   "none": 15 }[fec],
-				self.scan_sat.inversion.index,
+				self.scan_sat.polarization.value,
+				fec,
+				self.scan_sat.inversion.value,
 				satpos,
-				self.scan_sat.system.index,
-				self.scan_sat.modulation.index == 1 and 2 or 1,
-				self.scan_sat.rolloff.index,
-				self.scan_sat.pilot.index)
+				self.scan_sat.system.value,
+				self.scan_sat.modulation.value,
+				self.scan_sat.rolloff.value,
+				self.scan_sat.pilot.value)
 		elif tuning.type.value == "predefined_transponder":
 			transponder = nimmanager.getTransponders(satpos)[tuning.transponder.index]
 			returnvalue = (transponder[1] / 1000, transponder[2] / 1000,