git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for old api.. not all tested..
[enigma2.git]
/
lib
/
dvb
/
idvb.h
diff --git
a/lib/dvb/idvb.h
b/lib/dvb/idvb.h
index c4ae488dc311684c586fb512615560ae0c25c7ec..878b3619a3116219b7e7e5ede463e4eec8834db9 100644
(file)
--- a/
lib/dvb/idvb.h
+++ b/
lib/dvb/idvb.h
@@
-1,6
+1,10
@@
#ifndef __dvb_idvb_h
#define __dvb_idvb_h
#ifndef __dvb_idvb_h
#define __dvb_idvb_h
+#include <config.h>
+#if HAVE_DVB_API_VERSION < 3
+#include <ost/frontend.h>
+#endif
#include <lib/base/object.h>
#include <lib/base/ebase.h>
#include <lib/service/service.h>
#include <lib/base/object.h>
#include <lib/base/ebase.h>
#include <lib/service/service.h>
@@
-147,13
+151,13
@@
class iDVBChannel;
class iDVBDemux;
class iDVBFrontendParameters;
class iDVBDemux;
class iDVBFrontendParameters;
-class iDVBChannelList: public
virtual
iObject
+class iDVBChannelList: public iObject
{
public:
virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
};
{
public:
virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
};
-class iDVBResourceManager: public
virtual
iObject
+class iDVBResourceManager: public iObject
{
public:
/*
{
public:
/*
@@
-214,7
+218,7
@@
struct eDVBFrontendParametersTerrestrial
void set(const TerrestrialDeliverySystemDescriptor &);
};
void set(const TerrestrialDeliverySystemDescriptor &);
};
-class iDVBFrontendParameters: public
virtual
iObject
+class iDVBFrontendParameters: public iObject
{
public:
virtual RESULT getSystem(int &type) const = 0;
{
public:
virtual RESULT getSystem(int &type) const = 0;
@@
-236,7
+240,7
@@
struct eDVBDiseqcCommand
class iDVBSatelliteEquipmentControl;
class iDVBSatelliteEquipmentControl;
-class iDVBFrontend: public
virtual
iObject
+class iDVBFrontend: public iObject
{
public:
enum {
{
public:
enum {
@@
-267,7
+271,11
@@
public:
class iDVBSatelliteEquipmentControl: public iObject
{
public:
class iDVBSatelliteEquipmentControl: public iObject
{
public:
+#if HAVE_DVB_API_VERSION < 3
+ virtual RESULT prepare(iDVBFrontend &frontend, FrontendParameters &parm, eDVBFrontendParametersSatellite &sat)=0;
+#else
virtual RESULT prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat)=0;
virtual RESULT prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat)=0;
+#endif
};
struct eDVBCIRouting
};
struct eDVBCIRouting
@@
-275,7
+283,7
@@
struct eDVBCIRouting
int enabled;
};
int enabled;
};
-class iDVBChannel: public
virtual
iObject
+class iDVBChannel: public iObject
{
public:
enum
{
public:
enum
@@
-302,7
+310,7
@@
public:
class iDVBSectionReader;
class iTSMPEGDecoder;
class iDVBSectionReader;
class iTSMPEGDecoder;
-class iDVBDemux: public
virtual
iObject
+class iDVBDemux: public iObject
{
public:
virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
{
public:
virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;