summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-11-16 12:36:50 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-11-16 12:36:50 +0100
commitf8950822dd5ac531af08bb3a3fffa068a06698fe (patch)
tree2c3e816a41602516a3bad5a48f108a9017020985
parent1c97d69c040d229deb7f1796acad641ace03805b (diff)
downloadvdr-f8950822dd5ac531af08bb3a3fffa068a06698fe.tar.gz
vdr-f8950822dd5ac531af08bb3a3fffa068a06698fe.tar.bz2
Fixed disabling multiple recordings on a single DVB card
-rw-r--r--HISTORY3
-rw-r--r--dvbdevice.c19
2 files changed, 16 insertions, 6 deletions
diff --git a/HISTORY b/HISTORY
index f965b9b1..5b5eeefe 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1774,3 +1774,6 @@ Video Disk Recorder Revision History
- Fixed closing unused PID handles (thanks to Stefan Schluenss for reporting this
one).
- Added more examples to 'diseqc.conf' (thanks to Oliver Endriss).
+- Fixed disabling multiple recordings on a single DVB card (comment out the definition
+ of the macros DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and DO_MULTIPLE_RECORDINGS in
+ dvbdevice.c).
diff --git a/dvbdevice.c b/dvbdevice.c
index c519266e..e4b989d5 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 1.36 2002/11/15 13:53:41 kls Exp $
+ * $Id: dvbdevice.c 1.37 2002/11/16 12:36:50 kls Exp $
*/
#include "dvbdevice.h"
@@ -33,6 +33,7 @@ extern "C" {
#include "transfer.h"
#define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
+#define DO_MULTIPLE_RECORDINGS 1
#define DEV_VIDEO "/dev/video"
#define DEV_DVB_ADAPTER "/dev/dvb/adapter"
@@ -343,6 +344,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
bool needsDetachReceivers = true;
if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
+#ifdef DO_MULTIPLE_RECORDINGS
if (Receiving()) {
if (IsTunedTo(Channel)) {
needsDetachReceivers = false;
@@ -365,6 +367,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
result = hasPriority;
}
else
+#endif
result = hasPriority;
}
if (NeedsDetachReceivers)
@@ -381,11 +384,6 @@ static unsigned int FrequencyToHz(unsigned int f)
bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
{
-#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
- if (HasDecoder())
- LiveView = true;
-#endif
-
bool IsEncrypted = Channel->Ca() > CACONFBASE;
bool DoTune = !IsTunedTo(Channel);
@@ -408,6 +406,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
|| LiveView
);
+#ifndef DO_MULTIPLE_RECORDINGS
+ TurnOffLivePIDs = TurnOnLivePIDs = true;
+ StartTransferMode = false;
+#endif
+
// Stop setting system time:
if (siProcessor)
@@ -633,6 +636,10 @@ void cDvbDevice::SetAudioTrackDevice(int Index)
bool cDvbDevice::CanReplay(void) const
{
+#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+ if (Receiving())
+ return false;
+#endif
return cDevice::CanReplay() && !Ca(); // we can only replay if there is no Ca recording going on
}