summaryrefslogtreecommitdiff
path: root/conflictcheck.h
diff options
context:
space:
mode:
authorFrank Neumann <fnu@yavdr.org>2017-05-07 11:17:04 +0200
committerFrank Neumann <fnu@yavdr.org>2017-05-07 11:17:04 +0200
commit089dacafdf8b91155486e10e4cb32a791a771182 (patch)
treefb9b44bd792790b639f258db137d7cb138368252 /conflictcheck.h
parent2697e779f4034db48f342835cd40269693a2aacd (diff)
downloadvdr-plugin-epgsearch-089dacafdf8b91155486e10e4cb32a791a771182.tar.gz
vdr-plugin-epgsearch-089dacafdf8b91155486e10e4cb32a791a771182.tar.bz2
Drop legacy code prior VDR 2.0.0
Diffstat (limited to 'conflictcheck.h')
-rw-r--r--conflictcheck.h10
1 files changed, 0 insertions, 10 deletions
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 "";
}
};