summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-01-17 17:19:34 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-01-17 17:19:34 +0100
commitb21d2c4f12e9006e4b810b4f47d9fe931196bf93 (patch)
tree1f24b35963bf35f467dbd1beb44adb89334db00e
parent48dc6d871019762400fcdabe4f30f7e61b347d34 (diff)
downloadvdr-b21d2c4f12e9006e4b810b4f47d9fe931196bf93.tar.gz
vdr-b21d2c4f12e9006e4b810b4f47d9fe931196bf93.tar.bz2
Fixed handling PID changes in 'Transfer Mode'
-rw-r--r--HISTORY1
-rw-r--r--vdr.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 371a0c25..9142dce7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2598,3 +2598,4 @@ Video Disk Recorder Revision History
scan on a single DVB card system (see MANUAL for details).
- The new SVDRP command 'SCAN' can be used to force an EPG scan on a single
DVB card system (see MANUAL under Setup/EPG for details).
+- Fixed handling PID changes in 'Transfer Mode'.
diff --git a/vdr.c b/vdr.c
index e8987398..c4449858 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.173 2004/01/16 13:59:57 kls Exp $
+ * $Id: vdr.c 1.174 2004/01/17 16:56:57 kls Exp $
*/
#include <getopt.h>
@@ -52,6 +52,7 @@
#include "sources.h"
#include "timers.h"
#include "tools.h"
+#include "transfer.h"
#include "videodir.h"
#define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings
@@ -520,7 +521,7 @@ int main(int argc, char *argv[])
if (Channel && Channel->Modification(CHANNELMOD_RETUNE)) {
cRecordControls::ChannelDataModified(Channel);
if (Channel->Number() == cDevice::CurrentChannel()) {
- if (!cDevice::PrimaryDevice()->Replaying()) {
+ if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice()) {
isyslog("retuning due to modification of channel %d", Channel->Number());
Channels.SwitchTo(Channel->Number());
}