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

Now running even w/o DVB devices, provided at least one device is implemented by a plugin

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-08-16 09:57:10 +02:00
parent 435018bf4f
commit fd682083a4
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY
View File

@ -1393,7 +1393,7 @@ Video Disk Recorder Revision History
- Changed the cDevice class to allow plugins to implement their own devices (see - Changed the cDevice class to allow plugins to implement their own devices (see
PLUGINS.html for details). PLUGINS.html for details).
2002-08-15: Version 1.1.7 2002-08-16: Version 1.1.7
- Adapted VDR to the NEWSTRUCT driver. To use the new driver, compile VDR with - Adapted VDR to the NEWSTRUCT driver. To use the new driver, compile VDR with
'make NEWSTRUCT=1' (thanks to Holger Wächtler for some valuable advice). 'make NEWSTRUCT=1' (thanks to Holger Wächtler for some valuable advice).
@ -1412,3 +1412,6 @@ Video Disk Recorder Revision History
to Stefan Huelswitt). to Stefan Huelswitt).
- Improved cCondVar::Wait() and implemented cCondVar::TimedWait() (thanks to - Improved cCondVar::Wait() and implemented cCondVar::TimedWait() (thanks to
Stefan Huelswitt). Stefan Huelswitt).
- VDR no longer gives up if there is no DVB device. It continues to work if
there is at least one device, either a DVB device found by the core VDR code
itself, or a device implemented by a plugin.

4
device.c
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.11 2002/08/16 08:52:56 kls Exp $ * $Id: device.c 1.12 2002/08/16 09:50:43 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -97,7 +97,7 @@ bool cDevice::SetPrimaryDevice(int n)
primaryDevice->MakePrimaryDevice(true); primaryDevice->MakePrimaryDevice(true);
return true; return true;
} }
esyslog("invalid device number: %d", n + 1); esyslog("invalid primary device number: %d", n + 1);
return false; return false;
} }

11
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/people/kls/vdr * The project's page is at http://www.cadsoft.de/people/kls/vdr
* *
* $Id: vdr.c 1.119 2002/08/11 11:32:15 kls Exp $ * $Id: vdr.c 1.120 2002/08/16 09:54:03 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -327,8 +327,7 @@ int main(int argc, char *argv[])
// DVB interfaces: // DVB interfaces:
if (!cDvbDevice::Initialize()) cDvbDevice::Initialize();
return 2;
cSIProcessor::Read(); cSIProcessor::Read();
@ -340,6 +339,12 @@ int main(int argc, char *argv[])
// Primary device: // Primary device:
cDevice::SetPrimaryDevice(Setup.PrimaryDVB); cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
if (!cDevice::PrimaryDevice()) {
const char *msg = "no primary device found - giving up!";
fprintf(stderr, "vdr: %s\n", msg);
esyslog("ERROR: %s", msg);
return 2;
}
// OSD: // OSD: