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 comment, don't memmem over end of packet
[enigma2.git]
/
lib
/
dvb
/
decoder.h
diff --git
a/lib/dvb/decoder.h
b/lib/dvb/decoder.h
index bcf3eb388083ef216242262cf5591ff09bcaf5d8..05e07ef9aa4ef4a21fd9daa89e7aeb09d7204752 100644
(file)
--- a/
lib/dvb/decoder.h
+++ b/
lib/dvb/decoder.h
@@
-8,10
+8,10
@@
class eSocketNotifier;
class eDVBAudio: public iObject
{
class eDVBAudio: public iObject
{
-DECLARE_REF(eDVBAudio);
+
DECLARE_REF(eDVBAudio);
private:
ePtr<eDVBDemux> m_demux;
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);
public:
enum { aMPEG, aAC3, aDTS, aAAC };
eDVBAudio(eDVBDemux *demux, int dev);
@@
-36,13
+36,15
@@
public:
class eDVBVideo: public iObject, public Object
{
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;
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:
void video_event(int what);
Signal1<void, struct iTSMPEGDecoder::videoEvent> m_event;
public:
@@
-69,7
+71,7
@@
public:
class eDVBPCR: public iObject
{
class eDVBPCR: public iObject
{
-DECLARE_REF(eDVBPCR);
+
DECLARE_REF(eDVBPCR);
private:
ePtr<eDVBDemux> m_demux;
int m_fd_demux;
private:
ePtr<eDVBDemux> m_demux;
int m_fd_demux;
@@
-87,7
+89,7
@@
public:
class eDVBTText: public iObject
{
class eDVBTText: public iObject
{
-DECLARE_REF(eDVBTText);
+
DECLARE_REF(eDVBTText);
private:
ePtr<eDVBDemux> m_demux;
int m_fd_demux;
private:
ePtr<eDVBDemux> m_demux;
int m_fd_demux;
@@
-100,12
+102,12
@@
public:
class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
{
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;
static int m_pcm_delay;
static int m_ac3_delay;
static int m_audio_channel;
-DECLARE_REF(eTSMPEGDecoder);
std::string m_radio_pic;
std::string m_radio_pic;
-private:
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
ePtr<eDVBVideo> m_video;
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
ePtr<eDVBVideo> m_video;
@@
-128,6
+130,9
@@
private:
void demux_event(int event);
void video_event(struct videoEvent);
Signal1<void, struct videoEvent> m_video_event;
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);
public:
enum { pidNone = -1 };
eTSMPEGDecoder(eDVBDemux *demux, int decoder);