add possibility to change services in single service epg with bouquet +/- key

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

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 409a4421fee330c722f2fdc511e0af5b789db418..f2e10bb9eafd10e0d7e95e3e26bb832171616362 100644 (file)
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -8,12 +8,12 @@ class eSocketNotifier;
 
 class eDVBAudio: public iObject
 {
-DECLARE_REF(eDVBAudio);
+       DECLARE_REF(eDVBAudio);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd, m_fd_demux, m_dev, m_is_freezed;
 public:
-       enum { aMPEG, aAC3, aDTS, aAAC };
+       enum { aMPEG, aAC3, aDTS, aAAC, aAACHE };
        eDVBAudio(eDVBDemux *demux, int dev);
        enum { aMonoLeft, aStereo, aMonoRight };
        void setChannel(int channel);
@@ -36,7 +36,7 @@ public:
 
 class eDVBVideo: public iObject, public Object
 {
-DECLARE_REF(eDVBVideo);
+       DECLARE_REF(eDVBVideo);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd, m_fd_demux, m_dev;
@@ -44,11 +44,12 @@ private:
        m_fd_video;
 #endif
        int m_is_slow_motion, m_is_fast_forward, m_is_freezed;
-       eSocketNotifier *m_sn;
+       ePtr<eSocketNotifier> m_sn;
        void video_event(int what);
        Signal1<void, struct iTSMPEGDecoder::videoEvent> m_event;
+       int m_width, m_height, m_framerate, m_aspect, m_progressive;
 public:
-       enum { MPEG2, MPEG4_H264 };
+       enum { MPEG2, MPEG4_H264, MPEG1, MPEG4_Part2, VC1, VC1_SM };
        eDVBVideo(eDVBDemux *demux, int dev);
        void stop();
 #if HAVE_DVB_API_VERSION < 3
@@ -67,11 +68,16 @@ public:
        int getPTS(pts_t &now);
        virtual ~eDVBVideo();
        RESULT connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEvent> &event, ePtr<eConnection> &conn);
+       int getWidth();
+       int getHeight();
+       int getProgressive();
+       int getFrameRate();
+       int getAspect();
 };
 
 class eDVBPCR: public iObject
 {
-DECLARE_REF(eDVBPCR);
+       DECLARE_REF(eDVBPCR);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd_demux;
@@ -89,7 +95,7 @@ public:
 
 class eDVBTText: public iObject
 {
-DECLARE_REF(eDVBTText);
+       DECLARE_REF(eDVBTText);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd_demux;
@@ -102,10 +108,11 @@ public:
 
 class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
 {
+       DECLARE_REF(eTSMPEGDecoder);
+private:
        static int m_pcm_delay;
        static int m_ac3_delay;
        static int m_audio_channel;
-DECLARE_REF(eTSMPEGDecoder);
        std::string m_radio_pic;
        ePtr<eDVBDemux> m_demux;
        ePtr<eDVBAudio> m_audio;
@@ -130,7 +137,7 @@ DECLARE_REF(eTSMPEGDecoder);
        void video_event(struct videoEvent);
        Signal1<void, struct videoEvent> m_video_event;
        int m_video_clip_fd;
-       eTimer m_showSinglePicTimer;
+       ePtr<eTimer> m_showSinglePicTimer;
        void finishShowSinglePic(); // called by timer
 public:
        enum { pidNone = -1 };
@@ -163,6 +170,11 @@ public:
                /* what 0=auto, 1=video, 2=audio. */
        RESULT getPTS(int what, pts_t &pts);
        RESULT connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &connection);
+       int getVideoWidth();
+       int getVideoHeight();
+       int getVideoProgressive();
+       int getVideoFrameRate();
+       int getVideoAspect();
 };
 
 #endif