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
/
dvbtime.h
diff --git
a/lib/dvb/dvbtime.h
b/lib/dvb/dvbtime.h
index ffcfaa4168969fdd13c457fd5aee54f349eecfba..f403ffd4d17985c7fd3f341e54f3d05e157b3ef9 100644
(file)
--- a/
lib/dvb/dvbtime.h
+++ b/
lib/dvb/dvbtime.h
@@
-31,7
+31,7
@@
class TDT: public eGTable
{
eDVBChannel *chan;
ePtr<iDVBDemux> demux;
{
eDVBChannel *chan;
ePtr<iDVBDemux> demux;
- e
Timer
m_interval_timer;
+ e
Ptr<eTimer>
m_interval_timer;
int createTable(unsigned int nr, const __u8 *data, unsigned int max);
void ready(int);
int update_count;
int createTable(unsigned int nr, const __u8 *data, unsigned int max);
void ready(int);
int update_count;
@@
-49,7
+49,7
@@
class eDVBLocalTimeHandler: public Object
DECLARE_REF(eDVBLocalTimeHandler);
struct channel_data
{
DECLARE_REF(eDVBLocalTimeHandler);
struct channel_data
{
-
TDT *
tdt;
+
ePtr<TDT>
tdt;
ePtr<eDVBChannel> channel;
ePtr<eConnection> m_stateChangedConn;
int m_prevChannelState;
ePtr<eDVBChannel> channel;
ePtr<eConnection> m_stateChangedConn;
int m_prevChannelState;