diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-03-29 09:38:47 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-03-29 09:38:47 +0100 |
| commit | 8461facca5a30b5212f50854c0e5902260741c57 (patch) | |
| tree | b5381b045de58428119ba630cbf0066167b70a37 /conflictcheck.h | |
| parent | 13d9d41cc3d6af1468c34070a2cc083827b61ab9 (diff) | |
| download | vdr-plugin-epgsearch-8461facca5a30b5212f50854c0e5902260741c57.tar.gz vdr-plugin-epgsearch-8461facca5a30b5212f50854c0e5902260741c57.tar.bz2 | |
bug fix in conflict checking
NeedsDetachReceiver was not returned for vdr>=1.5.0 in GetDevice, so some conflicts where not reported
Diffstat (limited to 'conflictcheck.h')
| -rw-r--r-- | conflictcheck.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/conflictcheck.h b/conflictcheck.h index da6d080..0730c87 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -114,8 +114,9 @@ class cConflictCheckDevice return true; return false; } - bool HasDecoder() const { if (device) return device->HasDecoder(); else return (devicenr == 0); } - bool IsPrimaryDevice() const { if (device) return device->IsPrimaryDevice(); else return (devicenr == 0); } + 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 { if (device) return device->ProvidesSource(Source); @@ -210,8 +211,9 @@ class cConflictCheckDevice return true; return false; } - bool HasDecoder() const { if (device) return device->HasDecoder(); else return (devicenr == 0); } - bool IsPrimaryDevice() const { if (device) return device->IsPrimaryDevice(); else return (devicenr == 0); } + 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 { if (device) return device->ProvidesSource(Source); |