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 tuning to the channel of a VPS timer if the device is the actual device

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-04-28 13:29:22 +02:00
parent a302fd67af
commit 70297ef174
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -4676,3 +4676,4 @@ Video Disk Recorder Revision History
menu.c to "restart anyway?" (suggested by Rolf Ahrenberg). menu.c to "restart anyway?" (suggested by Rolf Ahrenberg).
- Removed the obsolete "'1' for encrypted radio channels" part from the description - Removed the obsolete "'1' for encrypted radio channels" part from the description
of the VPID in vdr.5 (reported by Alexander Hans). of the VPID in vdr.5 (reported by Alexander Hans).
- Fixed tuning to the channel of a VPS timer if the device is the actual device.

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.265 2006/04/28 12:24:04 kls Exp $ * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -792,9 +792,9 @@ int main(int argc, char *argv[])
} }
// Switch the device to the transponder: // Switch the device to the transponder:
if (Device) { if (Device) {
if (!Device->IsTunedToTransponder(Timer->Channel())) {
if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice()) if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
if (!Device->IsTunedToTransponder(Timer->Channel())) {
dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number()); dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
Device->SwitchChannel(Timer->Channel(), false); Device->SwitchChannel(Timer->Channel(), false);
DeviceUsed[Device->DeviceNumber()] = Now; DeviceUsed[Device->DeviceNumber()] = Now;