- add new listbox content type for multiple strings

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

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index 3b4cbede06fe9b0ef22d45effc26c1916d6000c0..d8c1078e52a58cf8f3edee7ad3a32c03514960e1 100644 (file)
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -4,23 +4,23 @@
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/isection.h>
 
-class eDVBDemux: public virtual iDVBDemux
+class eDVBDemux: public iDVBDemux
 {
        int adapter, demux;
        friend class eDVBSectionReader;
        friend class eDVBAudio;
        friend class eDVBVideo;
 public:
-       DECLARE_REF
+       DECLARE_REF(eDVBDemux);
        eDVBDemux(int adapter, int demux);
        virtual ~eDVBDemux();
        RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
        RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
 };
 
-class eDVBSectionReader: public virtual iDVBSectionReader, public Object
+class eDVBSectionReader: public iDVBSectionReader, public Object
 {
-       DECLARE_REF
+       DECLARE_REF(eDVBSectionReader);
 private:
        int fd;
        Signal1<void, const __u8*> read;