Initializing the current channel to '1'

This commit is contained in:
Klaus Schmidinger 2003-06-08 09:25:07 +02:00
parent 50076b8059
commit 60b8357463
3 changed files with 8 additions and 3 deletions

View File

@ -620,6 +620,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au> Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
for modifying LOF handling to allow for C-band reception for modifying LOF handling to allow for C-band reception
for reporting a crash in creating a new timer in case there is no device in the
system that can actually receive any channel
Ludwig Nussel <ludwig.nussel@web.de> Ludwig Nussel <ludwig.nussel@web.de>
for making the LIRC thread avoid high CPU load in case the connection to LIRC gets lost for making the LIRC thread avoid high CPU load in case the connection to LIRC gets lost

View File

@ -2235,7 +2235,7 @@ Video Disk Recorder Revision History
- Some corrections to the Finnish OSD texts (thanks to Jaakko Hyvätti). - Some corrections to the Finnish OSD texts (thanks to Jaakko Hyvätti).
- Officially released as version 1.2.0. - Officially released as version 1.2.0.
2003-06-07: Version 1.2.1 2003-06-08: Version 1.2.1
- Fixed OSD access in case none of the devices provides one (thanks to Axel - Fixed OSD access in case none of the devices provides one (thanks to Axel
Gruber for reporting this one). Gruber for reporting this one).
@ -2248,3 +2248,6 @@ Video Disk Recorder Revision History
- Fixed device handling in the CICAM menu in case a VDR instance was started - Fixed device handling in the CICAM menu in case a VDR instance was started
with a specific device using the -D option (thanks to Gerald Raaf for reporting with a specific device using the -D option (thanks to Gerald Raaf for reporting
ths one). ths one).
- Initializing the current channel to '1' to avoid a crash in creating a new
timer in case there is no device in the system that can actually receive any
channel (thanks to Malcolm Caldwell for reporting this one).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.c 1.44 2003/05/25 10:57:59 kls Exp $ * $Id: device.c 1.45 2003/06/08 09:19:59 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -28,7 +28,7 @@
int cDevice::numDevices = 0; int cDevice::numDevices = 0;
int cDevice::useDevice = 0; int cDevice::useDevice = 0;
int cDevice::nextCardIndex = 0; int cDevice::nextCardIndex = 0;
int cDevice::currentChannel = 0; int cDevice::currentChannel = 1;
cDevice *cDevice::device[MAXDEVICES] = { NULL }; cDevice *cDevice::device[MAXDEVICES] = { NULL };
cDevice *cDevice::primaryDevice = NULL; cDevice *cDevice::primaryDevice = NULL;