X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b5b839edc91a6902966079ec0b0bb5026df9df57..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/dvb/decoder.h

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index c864c095..05e07ef9 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -8,20 +8,24 @@ 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;
+	int m_fd, m_fd_demux, m_dev, m_is_freezed;
 public:
 	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();
-	void stopPid();
+	int setPid(int pid, int type);
+	int startPid();
+	int start();
+	int stopPid();
+	int setAVSync(int val);
+#else
+	int startPid(int pid, int type);
 #endif
 	void flush();
 	void freeze();
@@ -32,23 +36,28 @@ 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;
-	
-	int m_is_slow_motion, m_is_fast_forward;
-	eSocketNotifier *m_sn;
+#if HAVE_DVB_API_VERSION < 3
+	m_fd_video;
+#endif
+	int m_is_slow_motion, m_is_fast_forward, m_is_freezed;
+	ePtr<eSocketNotifier> m_sn;
 	void video_event(int what);
 	Signal1<void, struct iTSMPEGDecoder::videoEvent> m_event;
 public:
 	enum { MPEG2, MPEG4_H264 };
 	eDVBVideo(eDVBDemux *demux, int dev);
-	int startPid(int pid, int type=MPEG2);
 	void stop();
 #if HAVE_DVB_API_VERSION < 3
-	void start();
-	void stopPid();
+	int setPid(int pid);
+	int startPid();
+	int start();
+	int stopPid();
+#else
+	int startPid(int pid, int type=MPEG2);
 #endif
 	void flush();
 	void freeze();
@@ -62,20 +71,25 @@ public:
 
 class eDVBPCR: public iObject
 {
-DECLARE_REF(eDVBPCR);
+	DECLARE_REF(eDVBPCR);
 private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd_demux;
 public:
 	eDVBPCR(eDVBDemux *demux);
+#if HAVE_DVB_API_VERSION < 3
+	int setPid(int pid);
+	int startPid();
+#else
 	int startPid(int pid);
+#endif
 	void stop();
 	virtual ~eDVBPCR();
 };
 
 class eDVBTText: public iObject
 {
-DECLARE_REF(eDVBTText);
+	DECLARE_REF(eDVBTText);
 private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd_demux;
@@ -88,12 +102,12 @@ 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;
-private:
 	ePtr<eDVBDemux> m_demux;
 	ePtr<eDVBAudio> m_audio;
 	ePtr<eDVBVideo> m_video;
@@ -116,6 +130,9 @@ private:
 	void demux_event(int event);
 	void video_event(struct videoEvent);
 	Signal1<void, struct videoEvent> m_video_event;
+	int m_video_clip_fd;
+	ePtr<eTimer> m_showSinglePicTimer;
+	void finishShowSinglePic(); // called by timer
 public:
 	enum { pidNone = -1 };
 	eTSMPEGDecoder(eDVBDemux *demux, int decoder);
@@ -132,6 +149,7 @@ public:
 	RESULT setTextPID(int textpid);
 	RESULT setSyncMaster(int who);
 	RESULT start();
+	RESULT preroll();
 	RESULT freeze(int cont);
 	RESULT unfreeze();
 	RESULT setSinglePictureMode(int when);