summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-03-08 14:24:19 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-03-08 14:24:19 +0100
commita5c7994c267dba803b319c22c5ce22c514fc29d5 (patch)
tree37e1c4a2fa1e19410c6154f835ba3f07c1223b88
parent3b46788bcd96847dfdd1a8ace612ea4df5e73258 (diff)
downloadvdr-a5c7994c267dba803b319c22c5ce22c514fc29d5.tar.gz
vdr-a5c7994c267dba803b319c22c5ce22c514fc29d5.tar.bz2
Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0
-rw-r--r--HISTORY1
-rw-r--r--dvbapi.c9
2 files changed, 7 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index d4198814..7dd34581 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1071,3 +1071,4 @@ Video Disk Recorder Revision History
- Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
Bernd Schweikert).
+- Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0.
diff --git a/dvbapi.c b/dvbapi.c
index 2f1ca145..f5adda98 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.c 1.154 2002/03/03 15:43:24 kls Exp $
+ * $Id: dvbapi.c 1.155 2002/03/08 14:23:29 kls Exp $
*/
#include "dvbapi.h"
@@ -63,6 +63,9 @@ extern "C" {
// The maximum time to wait before giving up while catching up on an index file:
#define MAXINDEXCATCHUP 2 // seconds
+// The default priority for non-primary DVB cards:
+#define DEFAULTPRIORITY -2
+
#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
#define FATALERRNO (errno != EAGAIN && errno != EINTR)
@@ -1685,7 +1688,7 @@ cDvbApi::cDvbApi(int n)
transferBuffer = NULL;
transferringFromDvbApi = NULL;
ca = -1;
- priority = -1;
+ priority = DEFAULTPRIORITY;
cardIndex = n;
SetCaCaps();
@@ -2567,7 +2570,7 @@ void cDvbApi::StopRecord(void)
delete recordBuffer;
recordBuffer = NULL;
ca = -1;
- priority = -1;
+ priority = DEFAULTPRIORITY;
}
}