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 the primary device for receiving the live viewing channel in case it is bonded with an other device and has no receiver attached to it

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-02-12 12:45:35 +01:00
parent 2772964f99
commit cace8bed8d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -6836,7 +6836,7 @@ Video Disk Recorder Revision History
- Fixed frozen live view with device bonding in case the bonded master is used for - Fixed frozen live view with device bonding in case the bonded master is used for
live viewing (reported by Uwe Scheffler). live viewing (reported by Uwe Scheffler).
2012-02-11: Version 1.7.24 2012-02-12: Version 1.7.24
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a high load in case a transponder can't be received. - Fixed a high load in case a transponder can't be received.
@ -6853,3 +6853,5 @@ Video Disk Recorder Revision History
Sundararaj Reel). Sundararaj Reel).
- The epg.data file is now read in a separate thread to make the startup process - The epg.data file is now read in a separate thread to make the startup process
faster in case the file is very large (suggested by Helmut Auer). faster in case the file is very large (suggested by Helmut Auer).
- Fixed selecting the primary device for receiving the live viewing channel in
case it is bonded with an other device and has no receiver attached to it.

6
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.59 2012/01/17 15:16:12 kls Exp $ * $Id: dvbdevice.c 2.60 2012/02/12 12:38:49 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -1442,7 +1442,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
} }
else else
needsDetachReceivers = true; needsDetachReceivers = Receiving(true);
} }
if (result) { if (result) {
if (!BondingOk(Channel)) { if (!BondingOk(Channel)) {
@ -1454,7 +1454,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
} }
} }
needsDetachBondedReceivers = true; needsDetachBondedReceivers = true;
needsDetachReceivers = true; needsDetachReceivers = Receiving(true);
} }
} }
} }