X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c21489da95da44864e63edd6987baf17d3cbe84f..2f9441a67c7ed9630bb8875a179928ea4788fd80:/lib/dvb/decoder.h

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index bceca040..554d8c1b 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -11,9 +11,11 @@ private:
 	ePtr<eDVBDemux> m_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();
@@ -35,8 +37,9 @@ private:
 	
 	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();
@@ -86,7 +89,7 @@ private:
 	ePtr<eDVBVideo> m_video;
 	ePtr<eDVBPCR> m_pcr;
 	ePtr<eDVBTText> m_text;
-	int m_vpid, m_apid, m_atype, m_pcrpid, m_textpid;
+	int m_vpid, m_vtype, m_apid, m_atype, m_pcrpid, m_textpid;
 	enum
 	{
 		changeVideo = 1, 
@@ -104,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);