Commit 52774882 authored by Klaus Schmidinger's avatar Klaus Schmidinger

Version 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).
parent a4112a96
......@@ -44,6 +44,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
for suggesting to use the "Blue" button in the main menu to resume replay
for implementing pege up/down with the "Left" and "Right" keys
for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
for adding a missing #include to ringbuffer.c
Bastian Guse <bastian@nocopy.de>
for writing the FORMATS entry for timers.conf
......@@ -367,3 +368,9 @@ Paul Lacatus <paul@campina.iiruc.ro>
Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
for translating OSD texts to the Hungarian language
Christian Rienecker <C.Rienecker@deutschepost.de>
for making the VFAT handling more tolerant for users who forget to turn it on
Joerg Riechardt <J.Riechardt@gmx.de>
for filling in some missing teletext PIDs
......@@ -1378,3 +1378,17 @@ Video Disk Recorder Revision History
- Fixed a possible race condition in the cDvbPlayer (thanks to Andreas Schultz
for pointing out this one).
- Disabled channels on Transponder 12070 in 'channels.conf', which apparently no longer transmits.
2002-08-04: Version 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).
......@@ -4,10 +4,16 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 1.42 2002/06/22 10:21:56 kls Exp $
# $Id: Makefile 1.44 2002/07/28 15:20:47 kls Exp $
.DELETE_ON_ERROR:
CC = gcc
CFLAGS = -O2
CXX = g++
CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
DVBDIR = ../DVB
DTVDIR = ./libdtv
MANDIR = /usr/local/man
......@@ -21,7 +27,7 @@ INCLUDES = -I$(DVBDIR)/ost/include
DTVLIB = $(DTVDIR)/libdtv.a
OBJS = audio.o config.o cutter.o device.o dvbplayer.o dvbosd.o eit.o eitscan.o font.o i18n.o\
OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o eit.o eitscan.o font.o i18n.o\
interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
recorder.o recording.o remote.o remux.o ringbuffer.o status.o svdrp.o thread.o\
tools.o transfer.o vdr.o videodir.o
......@@ -58,11 +64,11 @@ font: genfontfile fontfix.c fontosd.c
# Implicit rules:
%.o: %.c
g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
# Dependencies:
MAKEDEP = g++ -MM -MG
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
......@@ -72,7 +78,7 @@ $(DEPFILE): Makefile
# The main program:
vdr: $(OBJS) $(DTVLIB)
g++ -g -O2 -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
# The font files:
......@@ -84,7 +90,7 @@ fontosd.c:
# The font file generator:
genfontfile: genfontfile.c
gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
$(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
# The libdtv library:
......
This diff is collapsed.
......@@ -18,3 +18,7 @@ VDR Plugin 'hello' Revision History
2002-05-17: Version 0.0.4
- Makefile improvements.
2002-08-04: Version 0.0.5
- Added a missing #include.
......@@ -3,15 +3,16 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: hello.c 1.5 2002/05/14 21:23:25 kls Exp $
* $Id: hello.c 1.6 2002/08/04 15:13:35 kls Exp $
*/
#include <getopt.h>
#include <stdlib.h>
#include <vdr/interface.h>
#include <vdr/plugin.h>
#include "i18n.h"
static const char *VERSION = "0.0.4";
static const char *VERSION = "0.0.5";
static const char *DESCRIPTION = "A friendly greeting";
static const char *MAINMENUENTRY = "Hello";
......
......@@ -7,7 +7,7 @@ BR3:11837:h:0:27500:201:202:204:0:28107
Hessen-3:11837:h:0:27500:301:302:304:0:28108
N3:12110:h:0:27500:2401:2402:2404:0:28224
SR3:11837:h:0:27500:501:502:504:0:28110
WDR:11837:h:0:27500:601:602:0:0:28111
WDR:11837:h:0:27500:601:602:604:0:28111
BR-alpha:11837:h:0:27500:701:702:704:0:28112
SWR BW:11837:h:0:27500:801:802:804:0:28113
Phoenix:11837:h:0:27500:901:902:904:0:28114
......@@ -24,7 +24,7 @@ Super RTL:12188:h:0:27500:165:120:65:0:12040
VOX:12188:h:0:27500:167:136:0:0:12060
DW TV:10788:v:0:22000:305:306:0:0:8905
Kabel 1:12480:v:0:27500:511:512:33:0:899
Neun Live:12480:v:0:27500:767:768:0:0:897
Neun Live:12480:v:0:27500:767:768:35:0:897
DSF:12480:v:0:27500:1023:1024:0:0:900
HOT:12480:v:0:27500:1279:1280:0:0:40
Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
......@@ -111,7 +111,7 @@ BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
:
TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
:#TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
Mosaico:11934:v:0:27500:165:100:0:0:29010
Andalucia TV:11934:v:0:27500:166:104:0:0:29011
TVC Internacional:11934:v:0:27500:167:108:0:0:0
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.c 1.102 2002/06/16 12:57:31 kls Exp $
* $Id: config.c 1.103 2002/08/04 12:03:11 kls Exp $
*/
#include "config.h"
......@@ -301,7 +301,7 @@ bool cChannel::Switch(cDevice *Device, bool Log)
if (Log)
isyslog("switching to channel %d", number);
for (int i = 3; i--;) {
switch (Device->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, tpid, ca, pnr)) {
switch (Device->SetChannel(this)) {
case scrOk: return true;
case scrNoTransfer: if (Interface)
Interface->Error(tr("Can't start Transfer Mode!"));
......@@ -1018,7 +1018,7 @@ cSetup::cSetup(void)
DefaultLifetime = 50;
UseSubtitle = 1;
RecordingDirs = 1;
VideoFormat = VIDEO_FORMAT_4_3;
VideoFormat = 0;
RecordDolbyDigital = 1;
ChannelInfoPos = 0;
OSDwidth = 52;
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 1.120 2002/07/13 09:46:59 kls Exp $
* $Id: config.h 1.121 2002/07/27 12:00:30 kls Exp $
*/
#ifndef __CONFIG_H
......@@ -19,7 +19,7 @@
#include "eit.h"
#include "tools.h"
#define VDRVERSION "1.1.5"
#define VDRVERSION "1.1.6"
#define MAXPRIORITY 99
#define MAXLIFETIME 99
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
* dvbdevice.h: The DVB device interface
*
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.h 1.1 2002/08/04 12:19:10 kls Exp $
*/
#ifndef __DVBDEVICE_H
#define __DVBDEVICE_H
#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
// FIXME: shouldn't every header file include ALL the other header
// FIXME: files it depends on? The sequence in which header files
// FIXME: are included here should not matter - and it should NOT
// FIXME: be necessary to include <stdlib.h> here!
#include <ost/frontend.h>
#include "device.h"
#include "eit.h"
class cDvbDevice : public cDevice {
friend class cDvbOsd;
private:
static bool Probe(const char *FileName);
// Probes for existing DVB devices.
public:
static bool Initialize(void);
// Initializes the DVB devices.
// Must be called before accessing any DVB functions.
private:
FrontendType frontendType;
int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video, fd_dvr;
int OsdDeviceHandle(void) const { return fd_osd; }
protected:
virtual void MakePrimaryDevice(bool On);
public:
cDvbDevice(int n);
virtual ~cDvbDevice();
virtual bool CanBeReUsed(int Frequency, int Vpid);
virtual bool HasDecoder(void) const;
// Channel facilities
private:
int frequency;
public:
virtual bool SetChannelDevice(const cChannel *Channel);
// PID handle facilities
protected:
virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
// Image Grab facilities
public:
virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
// Video format facilities
public:
virtual void SetVideoFormat(bool VideoFormat16_9);
// Volume facilities
protected:
virtual void SetVolumeDevice(int Volume);
// EIT facilities
private:
cSIProcessor *siProcessor;
// Player facilities
protected:
virtual int SetPlayMode(bool On);
public:
virtual void TrickSpeed(int Speed);
virtual void Clear(void);
virtual void Play(void);
virtual void Freeze(void);
virtual void Mute(void);
virtual void StillPicture(const uchar *Data, int Length);
virtual int PlayVideo(const uchar *Data, int Length);
virtual int PlayAudio(const uchar *Data, int Length);
// Receiver facilities
protected:
virtual bool OpenDvr(void);
virtual void CloseDvr(void);
virtual int GetTSPacket(uchar *Data);
};
#endif //__DVBDEVICE_H
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbosd.c 1.17 2002/05/18 13:39:02 kls Exp $
* $Id: dvbosd.c 1.18 2002/08/04 10:13:21 kls Exp $
*/
#include "dvbosd.h"
......@@ -13,10 +13,12 @@
#include <sys/unistd.h>
#include "tools.h"
cDvbOsd::cDvbOsd(int OsdDev, int x, int y)
const cDvbDevice *cDvbOsd::dvbDevice = NULL;
cDvbOsd::cDvbOsd(int x, int y)
:cOsdBase(x, y)
{
osdDev = OsdDev;
osdDev = dvbDevice ? dvbDevice->OsdDeviceHandle() : -1;
if (osdDev < 0)
esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
}
......@@ -27,6 +29,11 @@ cDvbOsd::~cDvbOsd()
CloseWindow(GetWindowNr(i));
}
void cDvbOsd::SetDvbDevice(const cDvbDevice *DvbDevice)
{
dvbDevice = DvbDevice;
}
bool cDvbOsd::SetWindow(cWindow *Window)
{
if (Window) {
......
......@@ -4,17 +4,19 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbosd.h 1.13 2002/05/18 13:38:09 kls Exp $
* $Id: dvbosd.h 1.14 2002/08/04 10:12:14 kls Exp $
*/
#ifndef __DVBOSD_H
#define __DVBOSD_H
#include <ost/osd.h>
#include "dvbdevice.h"
#include "osdbase.h"
class cDvbOsd : public cOsdBase {
private:
static const cDvbDevice *dvbDevice;
int osdDev;
bool SetWindow(cWindow *Window);
void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
......@@ -26,8 +28,9 @@ protected:
virtual void MoveWindow(cWindow *Window, int x, int y);
virtual void CloseWindow(cWindow *Window);
public:
cDvbOsd(int OsdDev, int x, int y);
cDvbOsd(int x, int y);
virtual ~cDvbOsd();
static void SetDvbDevice(const cDvbDevice *DvbDevice);
};
#endif //__DVBOSD_H
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbplayer.c 1.7 2002/07/14 14:30:36 kls Exp $
* $Id: dvbplayer.c 1.8 2002/07/27 11:57:48 kls Exp $
*/
#include "dvbplayer.h"
......@@ -90,6 +90,7 @@ private:
int replayFile;
bool eof;
bool active;
bool running;
ePlayModes playMode;
ePlayDirs playDir;
int trickSpeed;
......@@ -133,6 +134,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
index = NULL;
eof = false;
active = true;
running = false;
playMode = pmPlay;
playDir = pdForward;
trickSpeed = NORMAL_SPEED;
......@@ -285,8 +287,9 @@ void cDvbPlayer::Activate(bool On)
Start();
}
else if (active) {
active = false;
running = false;
Cancel(3);
active = false;
}
}
......@@ -308,7 +311,8 @@ void cDvbPlayer::Action(void)
if (readIndex >= 0)
isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
while (active && NextFile()) {
running = true;
while (running && NextFile()) {
pfd[1].fd = replayFile; // NextFile() may have returned a new file handle!
{
LOCK_THREAD;
......@@ -414,9 +418,9 @@ void cDvbPlayer::Action(void)
break;
}
}
active = running = false;
dsyslog("dvbplayer thread ended (pid=%d)", getpid());
active = false;
}
void cDvbPlayer::Pause(void)
......
......@@ -16,7 +16,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: eit.h 1.16 2002/03/10 10:56:57 kls Exp $
* $Id: eit.h 1.17 2002/08/04 11:30:24 kls Exp $
***************************************************************************/
#ifndef __EIT_H
......@@ -158,7 +158,7 @@ public:
static bool Read(FILE *f = NULL);
void SetStatus(bool On);
void SetCurrentTransponder(int CurrentTransponder);
bool SetCurrentServiceID(unsigned short servid);
static bool SetCurrentServiceID(unsigned short servid);
};
#endif
......@@ -4,10 +4,11 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: eitscan.c 1.3 2002/06/22 13:02:40 kls Exp $
* $Id: eitscan.c 1.4 2002/07/28 15:10:23 kls Exp $
*/
#include "eitscan.h"
#include <stdlib.h>
cEITScanner::cEITScanner(void)
{
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 1.202 2002/07/14 10:55:37 kls Exp $
* $Id: menu.c 1.203 2002/08/03 09:55:44 kls Exp $
*/
#include "menu.h"
......@@ -1628,7 +1628,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
if (state == osBack && Key == kOk) {
if (Setup.PrimaryDVB != oldPrimaryDVB) {
state = osSwitchDvb;
cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat);
}
}
return state;
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: osd.c 1.31 2002/07/14 10:57:45 kls Exp $
* $Id: osd.c 1.32 2002/08/04 10:11:26 kls Exp $
*/
#include "osd.h"
......@@ -73,7 +73,7 @@ cOsdBase *cOsd::OpenRaw(int x, int y)
#ifdef DEBUG_OSD
return NULL;
#else
return osd ? NULL : new cDvbOsd(cDevice::PrimaryDevice()->OsdDeviceHandle(), x, y);
return osd ? NULL : new cDvbOsd(x, y);
#endif
}
......
......@@ -4,18 +4,21 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: receiver.c 1.1 2002/06/08 09:58:29 kls Exp $
* $Id: receiver.c 1.3 2002/07/28 15:14:49 kls Exp $
*/
#include <stdarg.h>
#include <stdio.h>
#include "receiver.h"
#include "tools.h"
cReceiver::cReceiver(int Ca, int Priority, int NumPids, ...)
{
device = NULL;
ca = Ca;
priority = Priority;
for (int i = 0; i < MAXRECEIVEPIDS; i++)
pids[i] = 0;
if (NumPids) {
va_list ap;
va_start(ap, NumPids);
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: receiver.h 1.1 2002/06/08 15:32:51 kls Exp $
* $Id: receiver.h 1.2 2002/07/28 11:22:01 kls Exp $
*/
#ifndef __RECEIVER_H
......@@ -42,6 +42,9 @@ public:
// the given Priority. NumPids defines the number of PIDs that follow
// this parameter. If any of these PIDs are 0, they will be silently ignored.
// The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
// Priority may be any value in the range 0..99. Negative values indicate
// that this cReceiver may be detached at any time (without blocking the
// cDevice it is attached to).
virtual ~cReceiver();
};
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 1.64 2002/06/22 10:11:49 kls Exp $
* $Id: recording.c 1.65 2002/07/27 12:55:14 kls Exp $
*/
#include "recording.h"
......@@ -22,12 +22,24 @@
#define RECEXT ".rec"
#define DELEXT ".del"
/* This was the original code, which works fine in a Linux only environment.
Unfortunately, because of windows and its brain dead file system, we have
to use a more complicated approach, in order to allow users who have enabled
the VFAT compile time option to see their recordings even if they forget to
enable VFAT when compiling a new version of VDR... Gee, do I hate Windows.
(kls 2002-07-27)
#define DATAFORMAT "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
#define NAMEFORMAT "%s/%s/" DATAFORMAT
*/
// start of implementation for brain dead systems
#define DATAFORMAT "%4d-%02d-%02d.%02d%*c%02d.%02d.%02d" RECEXT
#ifdef VFAT
#define DATAFORMAT "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
#define nameFORMAT "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
#else
#define DATAFORMAT "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
#define nameFORMAT "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
#endif
#define NAMEFORMAT "%s/%s/" DATAFORMAT
#define NAMEFORMAT "%s/%s/" nameFORMAT
// end of implementation for brain dead systems
#define RESUMEFILESUFFIX "/resume.vdr"
#define SUMMARYFILESUFFIX "/summary.vdr"
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: remux.h 1.5 2001/06/23 14:06:59 kls Exp $
* $Id: remux.h 1.6 2002/08/04 10:27:07 kls Exp $
*/
#ifndef __REMUX_H
......@@ -12,6 +12,7 @@
#include <time.h> //XXX FIXME: DVB/ost/include/ost/dmx.h should include <time.h> itself!!!
#include <ost/dmx.h>
#include "tools.h"
// Picture types:
#define NO_PICTURE 0
......@@ -24,7 +25,6 @@
#define RESULTBUFFERSIZE (MINVIDEODATA * 4)
typedef unsigned char uchar;
class cTS2PES;
class cRemux {
......
......@@ -7,10 +7,11 @@
* Parts of this file were inspired by the 'ringbuffy.c' from the
* LinuxDVB driver (see linuxtv.org).
*
* $Id: ringbuffer.c 1.9 2002/06/16 11:24:40 kls Exp $
* $Id: ringbuffer.c 1.10 2002/07/28 12:47:32 kls Exp $
*/
#include "ringbuffer.h"
#include <stdlib.h>
#include <unistd.h>
#include "tools.h"
......
......@@ -4,15 +4,14 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: ringbuffer.h 1.6 2002/06/16 11:30:07 kls Exp $
* $Id: ringbuffer.h 1.7 2002/08/04 10:27:30 kls Exp $
*/
#ifndef __RINGBUFFER_H
#define __RINGBUFFER_H
#include "thread.h"
typedef unsigned char uchar;//XXX+
#include "tools.h"
class cRingBuffer {
private:
......
......@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: tools.c 1.67 2002/05/18 15:10:45 kls Exp $
* $Id: tools.c 1.68 2002/08/03 15:44:53 kls Exp $
*/
#include "tools.h"
......@@ -407,7 +407,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
char *ReadLink(const char *FileName)
{
char RealName[_POSIX_PATH_MAX];
char RealName[PATH_MAX];
const char *TargetName = NULL;
int n = readlink(FileName, RealName, sizeof(RealName) - 1);
if (n < 0) {
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment