setList() will invalidate itself

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

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 6694e9fcdb60814f97a0ad260dfe808d1ee5b1d8..df63955189a7a5afc02c2ed768221a6becdd5797 100644 (file)
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -4,9 +4,9 @@
 #include <lib/base/object.h>
 #include <lib/dvb/demux.h>
 
-class eDVBAudio: public virtual iObject
+class eDVBAudio: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(eDVBAudio);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd, m_fd_demux;
@@ -14,12 +14,16 @@ public:
        eDVBAudio(eDVBDemux *demux, int dev);
        int startPid(int pid);
        void stop();
+#if HAVE_DVB_API_VERSION < 3
+       void start();
+       void stopPid();
+#endif
        virtual ~eDVBAudio();
 };
 
-class eDVBVideo: public virtual iObject
+class eDVBVideo: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(eDVBVideo);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd, m_fd_demux;
@@ -27,17 +31,34 @@ public:
        eDVBVideo(eDVBDemux *demux, int dev);
        int startPid(int pid);
        void stop();
+#if HAVE_DVB_API_VERSION < 3
+       void start();
+       void stopPid();
+#endif
        virtual ~eDVBVideo();
 };
 
-class eTSMPEGDecoder: public virtual iTSMPEGDecoder
+class eDVBPCR: public iObject
+{
+DECLARE_REF(eDVBPCR);
+private:
+       ePtr<eDVBDemux> m_demux;
+       int m_fd_demux;
+public:
+       eDVBPCR(eDVBDemux *demux);
+       int startPid(int pid);
+       void stop();
+       virtual ~eDVBPCR();
+};
+
+class eTSMPEGDecoder: public iTSMPEGDecoder
 {
-DECLARE_REF;
+DECLARE_REF(eTSMPEGDecoder);
 private:
        ePtr<eDVBDemux> m_demux;
        ePtr<eDVBAudio> m_audio;
        ePtr<eDVBVideo> m_video;
-       
+       ePtr<eDVBPCR> m_pcr;
        int m_vpid, m_apid, m_atype, m_pcrpid;
        enum
        {