allow gstreamer to signalize missing plugins to the gui (requires reconfiguring enigm...

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

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index d3a369f96607c5afc04087b8716a3c7e0de832d4..1c0da47c6f6b27f188b5a5f615f3a66b9a623740 100644 (file)
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -15,23 +15,29 @@ 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);

+       RESULT createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader);

        RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
        RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);

-       RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
-       RESULT getSTC(pts_t &pts);
+       RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary);
+       RESULT getSTC(pts_t &pts, int num);

        RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
        RESULT flush();
        RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
        RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
        RESULT flush();
        RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);

+       
+       int getRefCount() { return ref; }

 private:
 private:

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

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

+       friend class eDVBPESReader;

        friend class eDVBAudio;
        friend class eDVBVideo;
        friend class eDVBPCR;
        friend class eDVBAudio;
        friend class eDVBVideo;
        friend class eDVBPCR;

+       friend class eDVBTText;

        friend class eDVBTSRecorder;
        friend class eDVBCAService;
        Signal1<void, int> m_event;
        friend class eDVBTSRecorder;
        friend class eDVBCAService;
        Signal1<void, int> m_event;


@@ -42,7 +48,6 @@ 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 fd;
        Signal1<void, const __u8*> read;
        ePtr<eDVBDemux> demux;


@@ -59,7 +64,24 @@ public:
        RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 
        RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 

-class eFilePushThread;
+class eDVBPESReader: public iDVBPESReader, public Object
+{
+       DECLARE_REF(eDVBPESReader);
+       int m_fd;
+       Signal2<void, const __u8*, int> m_read;
+       ePtr<eDVBDemux> m_demux;
+       int m_active;
+       void data(int);
+       eSocketNotifier *m_notifier;
+public:
+       eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
+       virtual ~eDVBPESReader();
+       RESULT start(int pid);
+       RESULT stop();
+       RESULT connectRead(const Slot2<void,const __u8*, int> &read, ePtr<eConnection> &conn);
+};
+
+class eDVBRecordFileThread;

 
 class eDVBTSRecorder: public iDVBTSRecorder, public Object
 {
 
 class eDVBTSRecorder: public iDVBTSRecorder, public Object
 {


@@ -72,9 +94,10 @@ public:
        RESULT addPID(int pid);
        RESULT removePID(int pid);
        
        RESULT addPID(int pid);
        RESULT removePID(int pid);
        

-       RESULT setFormat(int pid);
+       RESULT setTimingPID(int pid);

        
        RESULT setTargetFD(int fd);
        
        RESULT setTargetFD(int fd);

+       RESULT setTargetFilename(const char *filename);

        RESULT setBoundary(off_t max);
        
        RESULT stop();
        RESULT setBoundary(off_t max);
        
        RESULT stop();


@@ -84,14 +107,16 @@ private:
        RESULT startPID(int pid);
        void stopPID(int pid);
        
        RESULT startPID(int pid);
        void stopPID(int pid);
        

-       eFilePushThread *m_thread;
+       eDVBRecordFileThread *m_thread;
+       void filepushEvent(int event);

        
        std::map<int,int> m_pids;
        Signal1<void,int> m_event;
        
        ePtr<eDVBDemux> m_demux;
        
        
        std::map<int,int> m_pids;
        Signal1<void,int> m_event;
        
        ePtr<eDVBDemux> m_demux;
        

-       int m_running, m_format, m_target_fd, m_source_fd;
+       int m_running, m_target_fd, m_source_fd;
+       std::string m_target_filename;

 };
 
 #endif
 };
 
 #endif