git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
dvb
/
decoder.h
diff --git
a/lib/dvb/decoder.h
b/lib/dvb/decoder.h
index 7dfe38343a5868e605f0f5afaf1b1cf5dbeb111f..05e07ef9aa4ef4a21fd9daa89e7aeb09d7204752 100644
(file)
--- a/
lib/dvb/decoder.h
+++ b/
lib/dvb/decoder.h
@@
-44,7
+44,7
@@
private:
m_fd_video;
#endif
int m_is_slow_motion, m_is_fast_forward, m_is_freezed;
m_fd_video;
#endif
int m_is_slow_motion, m_is_fast_forward, m_is_freezed;
- e
SocketNotifier *
m_sn;
+ e
Ptr<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:
@@
-131,7
+131,7
@@
private:
void video_event(struct videoEvent);
Signal1<void, struct videoEvent> m_video_event;
int m_video_clip_fd;
void video_event(struct videoEvent);
Signal1<void, struct videoEvent> m_video_event;
int m_video_clip_fd;
- e
Timer
m_showSinglePicTimer;
+ e
Ptr<eTimer>
m_showSinglePicTimer;
void finishShowSinglePic(); // called by timer
public:
enum { pidNone = -1 };
void finishShowSinglePic(); // called by timer
public:
enum { pidNone = -1 };