summaryrefslogtreecommitdiff
path: root/dvbdevice.h
diff options
context:
space:
mode:
Diffstat (limited to 'dvbdevice.h')
-rw-r--r--dvbdevice.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/dvbdevice.h b/dvbdevice.h
index df7aa03..b5484dc 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.h 1.12 2002/10/06 08:57:24 kls Exp $
+ * $Id: dvbdevice.h 1.14 2002/10/12 11:15:39 kls Exp $
*/
#ifndef __DVBDEVICE_H
@@ -13,11 +13,6 @@
#ifdef NEWSTRUCT
#include <linux/dvb/frontend.h>
#else
-#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>
#endif
#include "device.h"
@@ -36,10 +31,11 @@ public:
// Initializes the DVB devices.
// Must be called before accessing any DVB functions.
private:
- FrontendType frontendType;
#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; }
@@ -86,10 +82,15 @@ public:
public:
virtual void SetVideoFormat(bool VideoFormat16_9);
-// Volume facilities
+// Audio facilities
+private:
+ int aPid1, aPid2;
protected:
virtual void SetVolumeDevice(int Volume);
+ virtual int NumAudioTracksDevice(void) const;
+ virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
+ virtual void SetAudioTrackDevice(int Index);
// EIT facilities