From fd1f60e0e0a346f5db69c03a68be6166a961e5b1 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 10 Aug 2002 14:58:25 +0200 Subject: Adapted VDR to the NEWSTRUCT driver --- dvbdevice.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'dvbdevice.h') diff --git a/dvbdevice.h b/dvbdevice.h index 25777f06..3cf3304d 100644 --- a/dvbdevice.h +++ b/dvbdevice.h @@ -4,18 +4,22 @@ * 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 $ + * $Id: dvbdevice.h 1.2 2002/08/09 16:23:53 kls Exp $ */ #ifndef __DVBDEVICE_H #define __DVBDEVICE_H +#ifdef NEWSTRUCT +#include +#else #include // 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 here! #include +#endif #include "device.h" #include "eit.h" @@ -30,7 +34,11 @@ public: // Must be called before accessing any DVB functions. private: FrontendType frontendType; +#ifdef NEWSTRUCT + int fd_osd, fd_frontend, fd_audio, fd_video, fd_dvr; +#else int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video, fd_dvr; +#endif int OsdDeviceHandle(void) const { return fd_osd; } protected: virtual void MakePrimaryDevice(bool On); -- cgit v1.2.3