git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some FIXMEEE's
[enigma2.git]
/
lib
/
dvb
/
decoder.h
diff --git
a/lib/dvb/decoder.h
b/lib/dvb/decoder.h
index f8719869b859fa00ce1110ea5075b9eba1f6d13d..8e8f65ad9fce3097c8cbacbcfbfcd228dbcd91bd 100644
(file)
--- a/
lib/dvb/decoder.h
+++ b/
lib/dvb/decoder.h
@@
-39,7
+39,7
@@
private:
public:
enum { MPEG2, MPEG4_H264 };
eDVBVideo(eDVBDemux *demux, int dev);
public:
enum { MPEG2, MPEG4_H264 };
eDVBVideo(eDVBDemux *demux, int dev);
- int startPid(int pid, int type);
+ int startPid(int pid, int type
=MPEG2
);
void stop();
#if HAVE_DVB_API_VERSION < 3
void start();
void stop();
#if HAVE_DVB_API_VERSION < 3
void start();
@@
-82,7
+82,11
@@
public:
class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
{
class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
{
+ static int m_pcm_delay;
+ static int m_ac3_delay;
+ static int m_audio_channel;
DECLARE_REF(eTSMPEGDecoder);
DECLARE_REF(eTSMPEGDecoder);
+ std::string m_radio_pic;
private:
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
private:
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
@@
-110,6
+114,11
@@
public:
RESULT setVideoPID(int vpid, int type);
RESULT setAudioPID(int apid, int type);
RESULT setAudioChannel(int channel);
RESULT setVideoPID(int vpid, int type);
RESULT setAudioPID(int apid, int type);
RESULT setAudioChannel(int channel);
+ int getAudioChannel();
+ RESULT setPCMDelay(int delay);
+ int getPCMDelay() { return m_pcm_delay; }
+ RESULT setAC3Delay(int delay);
+ int getAC3Delay() { return m_ac3_delay; }
RESULT setSyncPCR(int pcrpid);
RESULT setTextPID(int textpid);
RESULT setSyncMaster(int who);
RESULT setSyncPCR(int pcrpid);
RESULT setTextPID(int textpid);
RESULT setSyncMaster(int who);
@@
-123,7
+132,8
@@
public:
RESULT setZoom(int what);
RESULT flush();
RESULT setTrickmode(int what);
RESULT setZoom(int what);
RESULT flush();
RESULT setTrickmode(int what);
-
+ RESULT showSinglePic(const char *filename);
+ RESULT setRadioPic(const std::string &filename);
/* what 0=auto, 1=video, 2=audio. */
RESULT getPTS(int what, pts_t &pts);
};
/* what 0=auto, 1=video, 2=audio. */
RESULT getPTS(int what, pts_t &pts);
};