diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2011-09-14 21:06:49 +0300 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2011-09-19 19:03:36 +0200 |
| commit | 4c5fd51e7445d0288160aa2495a60b6847d759e8 (patch) | |
| tree | d85d437ba9224d35b694412e655a08b7b08b5c06 /conflictcheck.c | |
| parent | 4fc51ae39944b7c109cd2cdb7b3ea94fc391f0c8 (diff) | |
| download | vdr-plugin-epgsearch-4c5fd51e7445d0288160aa2495a60b6847d759e8.tar.gz vdr-plugin-epgsearch-4c5fd51e7445d0288160aa2495a60b6847d759e8.tar.bz2 | |
Remove miscellaneous obsolete VDR < 1.6.0 code.
Diffstat (limited to 'conflictcheck.c')
| -rw-r--r-- | conflictcheck.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/conflictcheck.c b/conflictcheck.c index 7b30326..671907c 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -510,8 +510,6 @@ int cConflictCheck::ProcessCheckTime(cConflictCheckTime* checkTime) return Conflicts; } -#if APIVERSNUM >= 10500 - eModuleStatus cConflictCheck::CamSlotModuleStatus(cCamSlot *CamSlot) { if (!CamSlot) return msNone; @@ -591,9 +589,7 @@ int cConflictCheck::GetDevice(cConflictCheckTimerObj* TimerObj, bool* NeedsDetac // avoid the primary device imp <<= 1; imp |= devices[i].IsPrimaryDevice(); // avoid cards with Common Interface for FTA channels -#if APIVERSNUM >= 10501 imp <<= 1; imp |= NumUsableSlots ? 0 : devices[i].HasCi(); -#endif // avoid full featured cards imp <<= 1; imp |= devices[i].HasDecoder(); // prefer CAMs that are known to decrypt this channel @@ -612,36 +608,6 @@ int cConflictCheck::GetDevice(cConflictCheckTimerObj* TimerObj, bool* NeedsDetac } return selDevice; } -#else -// retrieves a free device (nearly a copy of the original cDevice::GetDevice) -int cConflictCheck::GetDevice(cConflictCheckTimerObj* TimerObj, bool *NeedsDetachReceivers) -{ - int selDevice = -1; - int Priority = TimerObj->timer->Priority(); - const cChannel* Channel = TimerObj->timer->Channel(); - uint Impact = 0xFFFFFFFF; - for (int i = 0; i < numDevices; i++) { - bool ndr; - if (devices[i].ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job - uint imp = 0; - imp <<= 1; imp |= !devices[i].Receiving() || ndr; - imp <<= 1; imp |= devices[i].Receiving(); - imp <<= 1; //imp |= devices[i] == ActualDevice(); // cannot be handled - imp <<= 8; imp |= min(max(devices[i].Priority() + MAXPRIORITY, 0), 0xFF); - imp <<= 8; imp |= min(max(devices[i].ProvidesCa(Channel), 0), 0xFF); - imp <<= 1; imp |= devices[i].IsPrimaryDevice(); - imp <<= 1; imp |= devices[i].HasDecoder(); - if (imp < Impact) { - Impact = imp; - selDevice = i; - if (NeedsDetachReceivers) - *NeedsDetachReceivers = ndr; - } - } - } - return selDevice; -} -#endif void cConflictCheck::AddConflict(cConflictCheckTimerObj* TimerObj, cConflictCheckTime* CheckTime, std::set<cConflictCheckTimerObj*>& pendingTimers) { |