summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-03-25 10:44:04 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-03-25 10:44:04 +0200
commit55b6ab1dc6b449ef5ed8b3835756539145eee52c (patch)
tree5a099536b64c1797ad6596d6f2d144f1bd3cd4c4
parentbf970b5bf492c34a8ed83721dd5227ea4324230c (diff)
downloadvdr-55b6ab1dc6b449ef5ed8b3835756539145eee52c.tar.gz
vdr-55b6ab1dc6b449ef5ed8b3835756539145eee52c.tar.bz2
Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel()1.7.27
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--dvbdevice.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1a0ca47e..54bb679c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2417,6 +2417,7 @@ Frank Schmirler <vdr@schmirler.de>
for fixing the German translation of "Folder name must not contain '%c'!"
for suggestions used in revising priority handling to allow receivers with a priority
that is lower than that of live viewing
+ for fixing handling IDLEPRIORITY in cDvbDevice::ProvidesChannel()
Jörn Reder <joern@zyn.de>
for reporting that a recording may unnecessarily block a device with a CAM, while
diff --git a/HISTORY b/HISTORY
index 30e03cb5..1a1c8a6a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7010,7 +7010,7 @@ Video Disk Recorder Revision History
which is higher than any normal table id that is broadcast in the EIT data.
See PLUGINS.html, section "Electronic Program Guide" for more information.
-2012-03-20: Version 1.7.27
+2012-03-25: Version 1.7.27
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Changed the Green button in the "Edit timer" menu from "Once" to "Single"
@@ -7049,3 +7049,5 @@ Video Disk Recorder Revision History
- Fixed reduced bpp support for DVB subtitles (thanks to Rolf Ahrenberg).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Reverted some improvements to Make.config.template (thanks to Christian Ruppert).
+- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
+ Schmirler).
diff --git a/dvbdevice.c b/dvbdevice.c
index d7f3c499..65e9a4bc 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 2.68 2012/03/13 09:50:56 kls Exp $
+ * $Id: dvbdevice.c 2.69 2012/03/25 10:41:45 kls Exp $
*/
#include "dvbdevice.h"
@@ -1448,7 +1448,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
if (dvbTuner && ProvidesTransponder(Channel)) {
result = hasPriority;
- if (Priority >= 0) {
+ if (Priority > IDLEPRIORITY) {
if (Receiving()) {
if (dvbTuner->IsTunedTo(Channel)) {
if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0)) || Channel->Dpid(0) && !HasPid(Channel->Dpid(0))) {