diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-03-30 20:24:07 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-03-30 20:24:07 +0200 |
| commit | 11db30edf64aa8fdcbadc9fd39082c9bd0b6d826 (patch) | |
| tree | 75942727624cee541ad6950a79a78246b725651c | |
| parent | 666a125874efbbc1e182ab54baadb12c0912a81e (diff) | |
| download | vdr-plugin-epgsearch-11db30edf64aa8fdcbadc9fd39082c9bd0b6d826.tar.gz vdr-plugin-epgsearch-11db30edf64aa8fdcbadc9fd39082c9bd0b6d826.tar.bz2 | |
fix for 1.4.7 and 0.9.24.beta25
| -rw-r--r-- | conflictcheck.c | 2 | ||||
| -rw-r--r-- | conflictcheck.h | 1 | ||||
| -rw-r--r-- | epgsearch.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/conflictcheck.c b/conflictcheck.c index a24a071..2118a7d 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -558,7 +558,9 @@ 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 diff --git a/conflictcheck.h b/conflictcheck.h index 0730c87..2264dcb 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -115,7 +115,6 @@ class cConflictCheckDevice return false; } bool HasDecoder() const { if (device) return device->HasDecoder(); else return (devicenr == 3); } - bool HasCi() const { if (device) return device->HasCi(); else return (devicenr == 3); } bool IsPrimaryDevice() const { if (device) return device->IsPrimaryDevice(); else return (devicenr == 3); } bool ProvidesSource(int Source) const { diff --git a/epgsearch.c b/epgsearch.c index 2b2c7e2..f39593e 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -66,7 +66,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "menu_announcelist.h" #include "confdloader.h" -static const char VERSION[] = "0.9.24.beta24"; +static const char VERSION[] = "0.9.24.beta25"; static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more"); // globals |