diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-03-22 09:01:48 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-03-22 09:01:48 +0100 |
| commit | 22b4b620972d29510263805563aa53e810a11165 (patch) | |
| tree | 8627f768f16dafe9b0fc3edd963afdfdc5901563 /conflictcheck.c | |
| parent | eedb920807a5917ca63c6c8dd7c78e6e4bf2754e (diff) | |
| download | vdr-plugin-epgsearch-22b4b620972d29510263805563aa53e810a11165.tar.gz vdr-plugin-epgsearch-22b4b620972d29510263805563aa53e810a11165.tar.bz2 | |
support for a conf.d subdirectory
Diffstat (limited to 'conflictcheck.c')
| -rw-r--r-- | conflictcheck.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conflictcheck.c b/conflictcheck.c index 6c0ea4b..2016842 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -183,7 +183,7 @@ void cConflictCheck::InitDevicesInfo() { devices = new cConflictCheckDevice[MAXDEVICES]; #ifdef DEBUG_CONFL - numDevices = 2; + numDevices = 1; for(int i=0; i<numDevices; i++) { devices[i].devicenr = i; @@ -579,10 +579,10 @@ int cConflictCheck::GetDevice(cConflictCheckTimerObj* TimerObj, bool *NeedsDetac imp <<= 1; imp |= !devices[i].Receiving() || ndr; imp <<= 1; imp |= devices[i].Receiving(); imp <<= 1; //imp |= devices[i] == ActualDevice(); // cannot be handled - imp <<= 1; imp |= devices[i].IsPrimaryDevice(); - imp <<= 1; imp |= devices[i].HasDecoder(); imp <<= 8; imp |= min(max(devices[i].Priority() + MAXPRIORITY, 0), 0xFF); imp <<= 8; imp |= min(max(devices[i].ProvidesCa(Channel), 0), 0xFF); + imp <<= 1; imp |= devices[i].IsPrimaryDevice(); + imp <<= 1; imp |= devices[i].HasDecoder(); if (imp < Impact) { Impact = imp; selDevice = i; |