From 8461facca5a30b5212f50854c0e5902260741c57 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Sat, 29 Mar 2008 09:38:47 +0100 Subject: bug fix in conflict checking NeedsDetachReceiver was not returned for vdr>=1.5.0 in GetDevice, so some conflicts where not reported --- conflictcheck.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'conflictcheck.h') 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); -- cgit v1.2.3