X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=6fdeb534da524398fca58864aea04fda29eed12a;hp=4103f845462fdf0399a1285b5a9f003cd1e724b5;hb=5219d43296787b3592eedba7fd78b54e87638351;hpb=6c77bc054d80f13972ad37ff34e958ca49e7e7c1 diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 4103f84..6fdeb53 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -202,25 +202,25 @@ class CableTransponderSearchSupport: def startCableTransponderSearch(self, nim_idx): def GetCommand(nim_idx): - global cable_autoscan_nimtype - try: - nim_name = nimmanager.getNimName(nim_idx) - if nim_name is not None and nim_name != "": - device_id = "" - nim_name = nim_name.split(' ')[-1][4:-1] - if nim_name == 'TT3L10': - try: - device_id = GetDeviceId('TT3L10', nim_idx) - device_id = "--device=%s" % (device_id) - except Exception, err: - print "GetCommand ->", err - device_id = "--device=0" -# print nim_idx, nim_name, cable_autoscan_nimtype[nim_name], device_id - command = "%s %s" % (cable_autoscan_nimtype[nim_name], device_id) - return command - except Exception, err: - print "GetCommand ->", err - return "tda1002x" + global cable_autoscan_nimtype + try: + nim_name = nimmanager.getNimName(nim_idx) + if nim_name is not None and nim_name != "": + device_id = "" + nim_name = nim_name.split(' ')[-1][4:-1] + if nim_name == 'TT3L10': + try: + device_id = GetDeviceId('TT3L10', nim_idx) + device_id = "--device=%s" % (device_id) + except Exception, err: + print "GetCommand ->", err + device_id = "--device=0" +# print nim_idx, nim_name, cable_autoscan_nimtype[nim_name], device_id + command = "%s %s" % (cable_autoscan_nimtype[nim_name], device_id) + return command + except Exception, err: + print "GetCommand ->", err + return "tda1002x" if not self.tryGetRawFrontend(nim_idx): self.session.nav.stopService() @@ -1135,7 +1135,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport, Terrest elif self.scan_typeterrestrial.value == "complete": skip_t2 = True if nim.isCompatible("DVB-T2"): - scan_util = len(self.terrestrialTransponderGetCmd(self.feid)) and True or False + scan_util = len(self.terrestrialTransponderGetCmd(nim.slot)) and True or False if scan_util: action = SEARCH_TERRESTRIAL2_TRANSPONDERS else: