From 679dcebbb2091f8deb456f25bc263b1a7579524c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 5 Sep 2003 13:15:51 +0200 Subject: Fixed setting the primary device in case none of the devices provides an MPEG decoder --- CONTRIBUTORS | 4 ++++ HISTORY | 2 ++ vdr.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index b473c9e9..c1515ec0 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -787,3 +787,7 @@ Robert Bartl Sebastian Frei for his support in keeping 'channels.conf' up-to-date. + +Rene Bartsch + for reporting a bug in setting the primary device in case none of the devices + provides an MPEG decoder diff --git a/HISTORY b/HISTORY index 83913a9a..03f6aeb0 100644 --- a/HISTORY +++ b/HISTORY @@ -2364,3 +2364,5 @@ Video Disk Recorder Revision History - 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 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). diff --git a/vdr.c b/vdr.c index 051e3d85..cdc460ea 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.167 2003/09/05 13:01:00 kls Exp $ + * $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $ */ #include @@ -387,7 +387,7 @@ int main(int argc, char *argv[]) const char *msg = "no primary device found - using first device!"; fprintf(stderr, "vdr: %s\n", msg); esyslog("ERROR: %s", msg); - if (!cDevice::SetPrimaryDevice(0)) + if (!cDevice::SetPrimaryDevice(1)) return 2; if (!cDevice::PrimaryDevice()) { const char *msg = "no primary device found - giving up!"; -- cgit v1.2.3