From 0598e41418012326a30ba582b7d64db116e91a84 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 1 Nov 2002 10:26:45 +0100 Subject: Completely switched to the HEAD driver version --- dvbdevice.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'dvbdevice.h') diff --git a/dvbdevice.h b/dvbdevice.h index 8784c74e..46f1d106 100644 --- a/dvbdevice.h +++ b/dvbdevice.h @@ -4,17 +4,13 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.h 1.15 2002/10/26 11:35:04 kls Exp $ + * $Id: dvbdevice.h 1.16 2002/11/01 10:05:41 kls Exp $ */ #ifndef __DVBDEVICE_H #define __DVBDEVICE_H -#ifdef NEWSTRUCT #include -#else -#include -#endif #include "device.h" #include "dvbspu.h" #include "eit.h" @@ -31,13 +27,8 @@ public: // Initializes the DVB devices. // Must be called before accessing any DVB functions. private: -#ifdef NEWSTRUCT fe_type_t frontendType; int fd_osd, fd_frontend, fd_audio, fd_video, fd_dvr; -#else - FrontendType frontendType; - 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