lib/dvb/frontend.cpp: add missing fec_inner for DVBS2 API

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

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index e3759331c2278e15c317731a92be930bde401795..7a697d49db27b5473db29b4d07b77bf800a5202f 100644 (file)
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -15,6 +15,7 @@ public:
        virtual ~eDVBDemux();
        
        RESULT setSourceFrontend(int fenum);
        virtual ~eDVBDemux();
        
        RESULT setSourceFrontend(int fenum);

+       int getSource() { return source; }

        RESULT setSourcePVR(int pvrnum);
        
        RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
        RESULT setSourcePVR(int pvrnum);
        
        RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);


@@ -28,7 +29,7 @@ public:
        
        int getRefCount() { return ref; }
 private:
        
        int getRefCount() { return ref; }
 private:

-       int adapter, demux;
+       int adapter, demux, source;

        
        int m_dvr_busy;
        friend class eDVBSectionReader;
        
        int m_dvr_busy;
        friend class eDVBSectionReader;


@@ -47,14 +48,13 @@ private:
 class eDVBSectionReader: public iDVBSectionReader, public Object
 {
        DECLARE_REF(eDVBSectionReader);
 class eDVBSectionReader: public iDVBSectionReader, public Object
 {
        DECLARE_REF(eDVBSectionReader);

-private:

        int fd;
        Signal1<void, const __u8*> read;
        ePtr<eDVBDemux> demux;
        int active;
        int checkcrc;
        void data(int);
        int fd;
        Signal1<void, const __u8*> read;
        ePtr<eDVBDemux> demux;
        int active;
        int checkcrc;
        void data(int);

-       eSocketNotifier *notifier;
+       ePtr<eSocketNotifier> notifier;

 public:
        
        eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
 public:
        
        eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res);


@@ -67,13 +67,12 @@ public:
 class eDVBPESReader: public iDVBPESReader, public Object
 {
        DECLARE_REF(eDVBPESReader);
 class eDVBPESReader: public iDVBPESReader, public Object
 {
        DECLARE_REF(eDVBPESReader);

-private:

        int m_fd;
        Signal2<void, const __u8*, int> m_read;
        ePtr<eDVBDemux> m_demux;
        int m_active;
        void data(int);
        int m_fd;
        Signal2<void, const __u8*, int> m_read;
        ePtr<eDVBDemux> m_demux;
        int m_active;
        void data(int);

-       eSocketNotifier *m_notifier;
+       ePtr<eSocketNotifier> m_notifier;

 public:
        eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
        virtual ~eDVBPESReader();
 public:
        eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
        virtual ~eDVBPESReader();


@@ -95,14 +94,16 @@ public:
        RESULT addPID(int pid);
        RESULT removePID(int pid);
        
        RESULT addPID(int pid);
        RESULT removePID(int pid);
        

-       RESULT setTimingPID(int pid);
+       RESULT setTimingPID(int pid, int type);

        
        RESULT setTargetFD(int fd);
        RESULT setTargetFilename(const char *filename);
        RESULT setBoundary(off_t max);
        
        RESULT stop();
        
        RESULT setTargetFD(int fd);
        RESULT setTargetFilename(const char *filename);
        RESULT setBoundary(off_t max);
        
        RESULT stop();

-       
+
+       RESULT getCurrentPCR(pts_t &pcr);
+

        RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
 private:
        RESULT startPID(int pid);
        RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
 private:
        RESULT startPID(int pid);