From 089dacafdf8b91155486e10e4cb32a791a771182 Mon Sep 17 00:00:00 2001 From: Frank Neumann Date: Sun, 7 May 2017 11:17:04 +0200 Subject: Drop legacy code prior VDR 2.0.0 --- conflictcheck.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'conflictcheck.h') diff --git a/conflictcheck.h b/conflictcheck.h index 089c367..291fd37 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -165,20 +165,12 @@ class cConflictCheckDevice result = true; #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE else -#if APIVERSNUM < 10725 - result = Priority >= Setup.PrimaryLimit; -#else result = Priority >= 0; #endif -#endif #endif } else -#if APIVERSNUM < 10725 - result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; -#else result = !IsPrimaryDevice() || Priority >= 0; -#endif } else needsDetachReceivers = true; @@ -234,7 +226,6 @@ class cConflictCheckDevice cString GetBondingParams(const cChannel *Channel) const //copied from cDVBTuner { -#if APIVERSNUM > 10721 cDvbTransponderParameters dtp(Channel->Parameters()); if (Setup.DiSEqC) { if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL)) @@ -245,7 +236,6 @@ class cConflictCheckDevice bool VoltOff = dtp.Polarization() == 'V' || dtp.Polarization() == 'R'; return cString::sprintf("%c %c", ToneOff ? 't' : 'T', VoltOff ? 'v' : 'V'); } -#endif return ""; } }; -- cgit v1.2.3