From 8cdc6c5d6f8b6a492ccdbd2cc0df836ffc9191e8 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 4 Oct 2010 10:23:07 +0200 Subject: permit also to record from service groups (services with associated alternative services) --- lib/python/Screens/TimerEntry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Screens') diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 62faf9bf..9885e700 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -278,7 +278,7 @@ class TimerEntry(Screen, ConfigListScreen): self.keyGo() def keyGo(self, result = None): - if self.timerentry_service_ref.getType() != eServiceReference.idDVB or self.timerentry_service_ref.getPath() != "": + if not self.timerentry_service_ref.isRecordable(): self.session.openWithCallback(self.selectChannelSelector, MessageBox, _("You didn't select a channel to record from."), MessageBox.TYPE_ERROR) return self.timer.name = self.timerentry_name.value -- cgit v1.2.3 From fe72b7929c2f0b5dbac3040b303d195923735fc8 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Wed, 6 Oct 2010 09:43:35 +0200 Subject: fixes bug #593 use i2c_device from /proc/bus/nim_sockets for automatic cable scan --- lib/python/Components/NimManager.py | 3 +++ lib/python/Screens/ScanSetup.py | 21 ++++++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'lib/python/Screens') diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index f934ed50..67a1abc8 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -769,6 +769,9 @@ class NimManager: def getNim(self, slotid): return self.nim_slots[slotid] + + def getI2CDevice(self, slotid): + return self.nim_slots[slotid].getI2C() def getNimListOfType(self, type, exception = -1): # returns a list of indexes for NIMs compatible to the given type, except for 'exception' diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index f4828088..2e2f8364 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -192,21 +192,16 @@ class CableTransponderSearchSupport: self.cable_search_container.dataAvail.append(self.getCableTransponderData) cableConfig = config.Nims[nim_idx].cable tunername = nimmanager.getNimName(nim_idx) + bus = nimmanager.getI2CDevice(nim_idx) + if bus is None: + print "ERROR: could not get I2C device for nim", nim_idx, "for cable transponder search" + bus = 2 + if tunername == "CXD1981": - cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus " - else: - cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus " - #FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000 - if nim_idx < 2: - if HardwareInfo().get_device_name() == "dm500hd": - cmd += "2" - else: - cmd += str(nim_idx) + cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus %d" % bus else: - if nim_idx == 2: - cmd += "2" # first nim socket on DM8000 use /dev/i2c/2 - else: - cmd += "4" # second nim socket on DM8000 use /dev/i2c/4 + cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus %d" % bus + if cableConfig.scan_type.value == "bands": cmd += " --scan-bands " bands = 0 -- cgit v1.2.3