summaryrefslogtreecommitdiff
path: root/dvbdevice.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-11-01 10:26:45 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-11-01 10:26:45 +0100
commit0598e41418012326a30ba582b7d64db116e91a84 (patch)
tree4d878ea127dc6e66ba7e20b517f28bd9e69cce63 /dvbdevice.h
parent8c18d579ef6457435562fe88051eb0c93f86cd17 (diff)
downloadvdr-0598e41418012326a30ba582b7d64db116e91a84.tar.gz
vdr-0598e41418012326a30ba582b7d64db116e91a84.tar.bz2
Completely switched to the HEAD driver version
Diffstat (limited to 'dvbdevice.h')
-rw-r--r--dvbdevice.h11
1 files changed, 1 insertions, 10 deletions
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 <linux/dvb/frontend.h>
-#else
-#include <ost/frontend.h>
-#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);