fixes for old api.. not all tested..

[enigma2.git] / lib / dvb / dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index f6aae2386ea2ad09a00b78bff1add4ab2b8114a2..52dd9a0782dc671b6a9fbe5e0bad0c68d0ac1fa3 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -8,7 +8,7 @@
 
 class eDVBChannel;
 
-class eDVBResourceManager: public virtual iDVBResourceManager
+class eDVBResourceManager: public iDVBResourceManager
 {
        DECLARE_REF;
        int avail, busy;
@@ -38,8 +38,10 @@ public:
        RESULT removeChannel(const eDVBChannelID &chid, eDVBChannel *ch);
 };
 
-class eDVBChannel: public virtual iDVBChannel, public virtual eDVBDemux, public Object
+class eDVBChannel: public iDVBChannel, public eDVBDemux, public Object
 {
+       DECLARE_REF;
+private:
        ePtr<eDVBFrontend> m_frontend;
        ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
        eDVBChannelID m_channel_id;