Fixed setting the primary device in case none of the devices provides an MPEG decoder

This commit is contained in:
Klaus Schmidinger 2003-09-05 13:15:51 +02:00
parent 483f6c3970
commit 679dcebbb2
3 changed files with 8 additions and 2 deletions

View File

@ -787,3 +787,7 @@ Robert Bartl <robert@bartl.priv.at>
Sebastian Frei <sebastian@schnapsleichen.de> Sebastian Frei <sebastian@schnapsleichen.de>
for his support in keeping 'channels.conf' up-to-date. for his support in keeping 'channels.conf' up-to-date.
Rene Bartsch <ml@bartschnet.de>
for reporting a bug in setting the primary device in case none of the devices
provides an MPEG decoder

View File

@ -2364,3 +2364,5 @@ Video Disk Recorder Revision History
- Added a note about the driver version needed for the still picture fix from - Added a note about the driver version needed for the still picture fix from
version 1.2.5pre1 to work properly (thanks to Oliver Endriss for pointing version 1.2.5pre1 to work properly (thanks to Oliver Endriss for pointing
this out). this out).
- Fixed setting the primary device in case none of the devices provides an MPEG
decoder (thanks to Rene Bartsch for reporting this one).

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.167 2003/09/05 13:01:00 kls Exp $ * $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -387,7 +387,7 @@ int main(int argc, char *argv[])
const char *msg = "no primary device found - using first device!"; const char *msg = "no primary device found - using first device!";
fprintf(stderr, "vdr: %s\n", msg); fprintf(stderr, "vdr: %s\n", msg);
esyslog("ERROR: %s", msg); esyslog("ERROR: %s", msg);
if (!cDevice::SetPrimaryDevice(0)) if (!cDevice::SetPrimaryDevice(1))
return 2; return 2;
if (!cDevice::PrimaryDevice()) { if (!cDevice::PrimaryDevice()) {
const char *msg = "no primary device found - giving up!"; const char *msg = "no primary device found - giving up!";