git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add ts recorder
[enigma2.git]
/
lib
/
dvb
/
frontend.h
diff --git
a/lib/dvb/frontend.h
b/lib/dvb/frontend.h
index ee7f945a30422c87602e5a3578ba6a4cec3f35c6..f4e99fae3b626a3d471fc5df7a30aece0e2eca71 100644
(file)
--- a/
lib/dvb/frontend.h
+++ b/
lib/dvb/frontend.h
@@
-1,11
+1,12
@@
#ifndef __dvb_frontend_h
#define __dvb_frontend_h
#ifndef __dvb_frontend_h
#define __dvb_frontend_h
+#include <config.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/idvb.h>
-class eDVBFrontendParameters: public
virtual
iDVBFrontendParameters
+class eDVBFrontendParameters: public iDVBFrontendParameters
{
{
- DECLARE_REF;
+ DECLARE_REF
(eDVBFrontendParameters)
;
union
{
eDVBFrontendParametersSatellite sat;
union
{
eDVBFrontendParametersSatellite sat;
@@
-30,11
+31,14
@@
public:
RESULT getHash(unsigned long &hash) const;
};
RESULT getHash(unsigned long &hash) const;
};
-class eDVBFrontend: public
virtual
iDVBFrontend, public Object
+class eDVBFrontend: public iDVBFrontend, public Object
{
{
- DECLARE_REF;
+ DECLARE_REF
(eDVBFrontend)
;
int m_type;
int m_fd;
int m_type;
int m_fd;
+#if HAVE_DVB_API_VERSION < 3
+ int m_secfd;
+#endif
int m_state;
Signal1<void,iDVBFrontend*> m_stateChanged;
ePtr<iDVBSatelliteEquipmentControl> m_sec;
int m_state;
Signal1<void,iDVBFrontend*> m_stateChanged;
ePtr<iDVBSatelliteEquipmentControl> m_sec;