fix for working on old api

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

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index f1d074dbced85bff77229e5168058e5275c78439..554d8c1bd1420296b66f0fbf7be150c004f74196 100644 (file)
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -9,11 +9,13 @@ class eDVBAudio: public iObject
 DECLARE_REF(eDVBAudio);
 private:
        ePtr<eDVBDemux> m_demux;
-       int m_fd, m_fd_demux;
+       int m_fd, m_fd_demux, m_dev;
 public:
-       enum {aMPEG, aAC3, aDTS };
+       enum { aMPEG, aAC3, aDTS, aAAC };
        eDVBAudio(eDVBDemux *demux, int dev);
        int startPid(int pid, int type);
+       enum { aMonoLeft, aStereo, aMonoRight };
+       void setChannel(int channel);
        void stop();
 #if HAVE_DVB_API_VERSION < 3
        void start();
@@ -22,6 +24,7 @@ public:
        void flush();
        void freeze();
        void unfreeze();
+       int getPTS(pts_t &now);
        virtual ~eDVBAudio();
 };
 
@@ -30,12 +33,13 @@ class eDVBVideo: public iObject
 DECLARE_REF(eDVBVideo);
 private:
        ePtr<eDVBDemux> m_demux;
-       int m_fd, m_fd_demux;
+       int m_fd, m_fd_demux, m_dev;
        
        int m_is_slow_motion, m_is_fast_forward;
 public:
+       enum { MPEG2, MPEG4_H264 };
        eDVBVideo(eDVBDemux *demux, int dev);
-       int startPid(int pid);
+       int startPid(int pid, int type=MPEG2);
        void stop();
 #if HAVE_DVB_API_VERSION < 3
        void start();
@@ -46,6 +50,7 @@ public:
        int setSlowMotion(int repeat);
        int setFastForward(int skip);
        void unfreeze();
+       int getPTS(pts_t &now);
        virtual ~eDVBVideo();
 };
 
@@ -62,17 +67,17 @@ public:
        virtual ~eDVBPCR();
 };
 
-class eDVBVText: public iObject
+class eDVBTText: public iObject
 {
-DECLARE_REF(eDVBVText);
+DECLARE_REF(eDVBTText);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd_demux;
 public:
-       eDVBVText(eDVBDemux *demux);
+       eDVBTText(eDVBDemux *demux);
        int startPid(int pid);
        void stop();
-       virtual ~eDVBVText();
+       virtual ~eDVBTText();
 };
 
 class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
@@ -83,8 +88,8 @@ private:
        ePtr<eDVBAudio> m_audio;
        ePtr<eDVBVideo> m_video;
        ePtr<eDVBPCR> m_pcr;
-       ePtr<eDVBVText> m_text;
-       int m_vpid, m_apid, m_atype, m_pcrpid, m_textpid;
+       ePtr<eDVBTText> m_text;
+       int m_vpid, m_vtype, m_apid, m_atype, m_pcrpid, m_textpid;
        enum
        {
                changeVideo = 1, 
@@ -92,7 +97,7 @@ private:
                changePCR   = 4,
                changeText  = 8
        };
-       int m_changed;
+       int m_changed, m_decoder;
        int m_is_ff, m_is_sm, m_is_trickmode;
        int setState();
        ePtr<eConnection> m_demux_event;
@@ -102,8 +107,9 @@ public:
        enum { pidNone = -1 };
        eTSMPEGDecoder(eDVBDemux *demux, int decoder);
        virtual ~eTSMPEGDecoder();
-       RESULT setVideoPID(int vpid);
+       RESULT setVideoPID(int vpid, int type);
        RESULT setAudioPID(int apid, int type);
+       RESULT setAudioChannel(int channel);
        RESULT setSyncPCR(int pcrpid);
        RESULT setTextPID(int textpid);
        RESULT setSyncMaster(int who);
@@ -117,5 +123,9 @@ public:
        RESULT setZoom(int what);
        RESULT flush();
        RESULT setTrickmode(int what);
+       
+               /* what 0=auto, 1=video, 2=audio. */
+       RESULT getPTS(int what, pts_t &pts);
 };
+
 #endif