- hopefully fixed some python/refcount stuff (__deref__ is still evil!)

[vuplus_dvbapp] / lib / dvb / frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index ee7f945..f4e99fa 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -1,11 +1,12 @@
 #ifndef __dvb_frontend_h
 #define __dvb_frontend_h
 
+#include <config.h>
 #include <lib/dvb/idvb.h>
 
-class eDVBFrontendParameters: public virtual iDVBFrontendParameters
+class eDVBFrontendParameters: public iDVBFrontendParameters
 {
-       DECLARE_REF;
+       DECLARE_REF(eDVBFrontendParameters);
        union
        {
                eDVBFrontendParametersSatellite sat;
@@ -30,11 +31,14 @@ public:
        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;
+#if HAVE_DVB_API_VERSION < 3
+       int m_secfd;
+#endif
        int m_state;
        Signal1<void,iDVBFrontend*> m_stateChanged;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;