frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed switching to a visible programme in case the current channel has neither a video nor an audio PID

This commit is contained in:
Klaus Schmidinger 2004-02-13 13:15:12 +01:00
parent d828badbe0
commit f379b56d0e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -2652,6 +2652,8 @@ Video Disk Recorder Revision History
actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped
down to the values 0..4. down to the values 0..4.
2004-02-09: Version 1.3.5 2004-02-13: Version 1.3.5
- Fixed reading the EPG preferred language parameter from 'setup.conf'. - Fixed reading the EPG preferred language parameter from 'setup.conf'.
- Fixed switching to a visible programme in case the current channel has neither
a video nor an audio PID.

16
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.175 2004/02/08 11:23:29 kls Exp $ * $Id: vdr.c 1.176 2004/02/13 13:13:13 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -496,11 +496,15 @@ int main(int argc, char *argv[])
if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) { if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
static time_t lastTime = 0; static time_t lastTime = 0;
if (time(NULL) - lastTime > MINCHANNELWAIT) { if (time(NULL) - lastTime > MINCHANNELWAIT) {
if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel... cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
&& !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer... if (Channel && (Channel->Vpid() || Channel->Apid1())) {
&& !cDevice::SwitchChannel(1) // ...or the next higher available one... if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
&& !cDevice::SwitchChannel(-1)) // ...or the next lower available one && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
lastTime = time(NULL); // don't do this too often && !cDevice::SwitchChannel(1) // ...or the next higher available one...
&& !cDevice::SwitchChannel(-1)) // ...or the next lower available one
;
}
lastTime = time(NULL); // don't do this too often
LastTimerChannel = -1; LastTimerChannel = -1;
} }
} }