frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed selecting devices for the EPG scan in case the primary device is bonded with an other one

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-03-07 13:46:13 +01:00
parent 61e420bdf6
commit 40d06559bb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -6960,7 +6960,7 @@ Video Disk Recorder Revision History
which was made in version 1.1.10, so please report if this has any unwanted which was made in version 1.1.10, so please report if this has any unwanted
side effects. side effects.
2012-03-06: Version 1.7.26 2012-03-07: Version 1.7.26
- Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich). - Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich).
- Fixed the German translation of "VDR will shut down in %s minutes" (thanks to - Fixed the German translation of "VDR will shut down in %s minutes" (thanks to
@ -6979,3 +6979,5 @@ Video Disk Recorder Revision History
- Fixed switching devices to the transponders of VPS recordings in case there - Fixed switching devices to the transponders of VPS recordings in case there
are only bonded devices. The cDevice's "avoid device" mechanism has been replaced are only bonded devices. The cDevice's "avoid device" mechanism has been replaced
by using "occupied". by using "occupied".
- Fixed selecting devices for the EPG scan in case the primary device is bonded
with an other one.

4
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: dvbdevice.c 2.65 2012/02/29 12:23:43 kls Exp $ * $Id: dvbdevice.c 2.66 2012/03/07 13:37:01 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -420,7 +420,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
if (cDvbTuner *t = bondedTuner) { if (cDvbTuner *t = bondedTuner) {
cString BondingParams = GetBondingParams(Channel); cString BondingParams = GetBondingParams(Channel);
do { do {
if (t->device->Receiving() || ConsiderOccupied && t->device->Occupied()) { if (t->device->Priority() > IDLEPRIORITY || ConsiderOccupied && t->device->Occupied()) {
if (strcmp(BondingParams, t->GetBondingParams()) != 0) if (strcmp(BondingParams, t->GetBondingParams()) != 0)
return false; return false;
} }