X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a0f0f0b446b7b0fd941194299fa4840b609df1f0..59f9f67261d0e6018293871d00cbd12572fbb4c7:/lib/dvb/decoder.h

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index f2e10bb9..3a0fbac1 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -13,7 +13,7 @@ private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd, m_fd_demux, m_dev, m_is_freezed;
 public:
-	enum { aMPEG, aAC3, aDTS, aAAC, aAACHE };
+	enum { aMPEG, aAC3, aDTS, aAAC, aAACHE, aLPCM };
 	eDVBAudio(eDVBDemux *demux, int dev);
 	enum { aMonoLeft, aStereo, aMonoRight };
 	void setChannel(int channel);
@@ -80,9 +80,9 @@ class eDVBPCR: public iObject
 	DECLARE_REF(eDVBPCR);
 private:
 	ePtr<eDVBDemux> m_demux;
-	int m_fd_demux;
+	int m_fd_demux, m_dev;
 public:
-	eDVBPCR(eDVBDemux *demux);
+	eDVBPCR(eDVBDemux *demux, int dev);
 #if HAVE_DVB_API_VERSION < 3
 	int setPid(int pid);
 	int startPid();
@@ -98,9 +98,9 @@ class eDVBTText: public iObject
 	DECLARE_REF(eDVBTText);
 private:
 	ePtr<eDVBDemux> m_demux;
-	int m_fd_demux;
+	int m_fd_demux, m_dev;
 public:
-	eDVBTText(eDVBDemux *demux);
+	eDVBTText(eDVBDemux *demux, int dev);
 	int startPid(int pid);
 	void stop();
 	virtual ~eDVBTText();
@@ -125,10 +125,12 @@ private:
 		changeVideo = 1, 
 		changeAudio = 2, 
 		changePCR   = 4,
-		changeText  = 8
+		changeText  = 8,
+		changeState = 16,
 	};
 	int m_changed, m_decoder;
-	int m_is_ff, m_is_sm, m_is_trickmode;
+	int m_state;
+	int m_ff_sm_ratio;
 	int setState();
 	ePtr<eConnection> m_demux_event_conn;
 	ePtr<eConnection> m_video_event_conn;
@@ -154,17 +156,33 @@ public:
 	RESULT setSyncPCR(int pcrpid);
 	RESULT setTextPID(int textpid);
 	RESULT setSyncMaster(int who);
-	RESULT start();
-	RESULT preroll();
-	RESULT freeze(int cont);
-	RESULT unfreeze();
-	RESULT setSinglePictureMode(int when);
-	RESULT setPictureSkipMode(int what);
-	RESULT setFastForward(int frames_to_skip);
-	RESULT setSlowMotion(int repeat);
-	RESULT setZoom(int what);
+	
+		/*
+		The following states exist:
+		
+		 - stop: data source closed, no playback
+		 - pause: data source active, decoder paused
+		 - play: data source active, decoder consuming
+		 - decoder fast forward: data source linear, decoder drops frames
+		 - trickmode, highspeed reverse: data source fast forwards / reverses, decoder just displays frames as fast as it can
+		 - slow motion: decoder displays frames multiple times
+		*/
+	enum {
+		stateStop,
+		statePause,
+		statePlay,
+		stateDecoderFastForward,
+		stateTrickmode,
+		stateSlowMotion
+	};
+	RESULT set(); /* just apply settings, keep state */
+	RESULT play(); /* -> play */
+	RESULT pause(); /* -> pause */
+	RESULT setFastForward(int frames_to_skip); /* -> decoder fast forward */
+	RESULT setSlowMotion(int repeat); /* -> slow motion **/
+	RESULT setTrickmode(); /* -> highspeed fast forward */
+
 	RESULT flush();
-	RESULT setTrickmode(int what);
 	RESULT showSinglePic(const char *filename);
 	RESULT setRadioPic(const std::string &filename);
 		/* what 0=auto, 1=video, 2=audio. */
@@ -175,6 +193,8 @@ public:
 	int getVideoProgressive();
 	int getVideoFrameRate();
 	int getVideoAspect();
+	static RESULT setHwPCMDelay(int delay);
+	static RESULT setHwAC3Delay(int delay);
 };
 
 #endif