Version 1.1.6vdr-1.1.6

- Re-visited the race condition fix in the cDvbPlayer (thanks again to Andreas
  Schultz).
- Changed the VFAT handling to allow users who normally use it but have forgotten
  to set it when compiling a new version of VDR to at least see their recordings
  made with VFAT enabled (thanks to Christian Rienecker).
- Added some missing teletext PIDs (thanks to Joerg Riechardt).
- Fixed PID handling for cReceiver.
- Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid).
- Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile.
- Changed the cDevice class to allow plugins to implement their own devices (see
  PLUGINS.html for details).

1 files changed, 7 insertions, 4 deletions

diff --git a/vdr.c b/vdr.c
index 10c54f7..fa7429c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.117 2002/06/23 11:23:34 kls Exp $
+ * $Id: vdr.c 1.118 2002/08/04 09:56:30 kls Exp $
  */
 
 #include <getopt.h>
@@ -33,6 +33,7 @@
 #include "config.h"
 #include "cutter.h"
 #include "device.h"
+#include "dvbdevice.h"
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
@@ -326,11 +327,9 @@ int main(int argc, char *argv[])
 
   // DVB interfaces:
 
-  if (!cDevice::Initialize())
+  if (!cDvbDevice::Initialize())
      return 2;
 
-  cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
-
   cSIProcessor::Read();
 
   // Start plugins:
@@ -338,6 +337,10 @@ int main(int argc, char *argv[])
   if (!PluginManager.StartPlugins())
      return 2;
 
+  // Primary device:
+
+  cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
+
   // OSD:
 
   cOsd::Initialize();