Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

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

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 409a4421fee330c722f2fdc511e0af5b789db418..05e07ef9aa4ef4a21fd9daa89e7aeb09d7204752 100644 (file)
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -8,7 +8,7 @@ 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;
@@ -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,7 +44,7 @@ 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;
 public:
@@ -71,7 +71,7 @@ public:
 
 class eDVBPCR: public iObject
 {
-DECLARE_REF(eDVBPCR);
+       DECLARE_REF(eDVBPCR);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd_demux;
@@ -89,7 +89,7 @@ public:
 
 class eDVBTText: public iObject
 {
-DECLARE_REF(eDVBTText);
+       DECLARE_REF(eDVBTText);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd_demux;
@@ -102,10 +102,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 +131,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 };