X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=f6ef01cf030c009d6720456f00457ddfb6bab711;hp=d749e1e7617918fd3618d9b4a684af80c64afa19;hb=619983c4f596e3371c58c52dd725680846376484;hpb=435109600b9748e54b1aa9d21bfc3261d14abd60

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index d749e1e..f6ef01c 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -3,7 +3,7 @@ from ServiceScan import *
 from Components.config import config, ConfigSubsection, ConfigSelection, ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigSatlist, ConfigEnableDisable
 from Components.ActionMap import NumberActionMap
 from Components.ConfigList import ConfigList, ConfigListScreen
-from Components.NimManager import nimmanager
+from Components.NimManager import nimmanager, getConfigSatlist
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, eDVBFrontendParametersCable
@@ -327,9 +327,9 @@ class ScanSetup(ConfigListScreen, Screen):
 				elif frontendData["tuner_type"] == "DVB-C":
 					defaultCab["frequency"] = int(frontendData["frequency"] / 1000)
 					defaultCab["symbolrate"] = int(frontendData["symbol_rate"] / 1000)
-					defaultSat["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData["inversion"]]
-					defaultSat["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData["fec_inner"]]
-					defaultSat["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData["modulation"]]
+					defaultCab["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData["inversion"]]
+					defaultCab["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData["fec_inner"]]
+					defaultCab["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData["modulation"]]
 
 			self.scan_sat = ConfigSubsection()
 			self.scan_cab = ConfigSubsection()
@@ -396,14 +396,7 @@ class ScanSetup(ConfigListScreen, Screen):
 			for slot in nimmanager.nimslots:
 				if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]):
 					print str(slot.slotid) + " : " + str(self.satList)
-					default_orbpos = None
-					orbpos = defaultSat["orbpos"]
-					satlist = self.satList[slot.slotid]
-					for x in satlist:
-						if x[0] == orbpos:
-							default_orbpos = orbpos
-							break
-					self.scan_satselection.append(ConfigSatlist(default = default_orbpos, list = satlist))
+					self.scan_satselection.append(getConfigSatlist(defaultSat["orbpos"],self.satList[slot.slotid]))
 				else:
 					self.scan_satselection.append(None)
 
@@ -490,7 +483,8 @@ class ScanSetup(ConfigListScreen, Screen):
 			elif self.scan_type.value == "single_satellite":
 				sat = self.satList[self.scan_nims.index][self.scan_satselection[self.scan_nims.index].index]
 				getInitialTransponderList(tlist, sat[0])
-				flags |= eComponentScan.scanNetworkSearch
+				if sat[2] & 1:
+					flags |= eComponentScan.scanNetworkSearch
 				tmp = self.scan_clearallservices.value
 				if tmp == "yes":
 					flags |= eComponentScan.scanRemoveServices