git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add invalidate to eListboxPythonStringContent
[enigma2.git]
/
lib
/
dvb
/
dvbtime.h
diff --git
a/lib/dvb/dvbtime.h
b/lib/dvb/dvbtime.h
index a1746b5e1599d1f2afc5ea67847175b907c9aec4..fbc82f06e9eef8014008650c7645911aee1e893b 100644
(file)
--- a/
lib/dvb/dvbtime.h
+++ b/
lib/dvb/dvbtime.h
@@
-3,10
+3,19
@@
#include <lib/base/eerror.h>
#include <lib/dvb/esection.h>
#include <lib/base/eerror.h>
#include <lib/dvb/esection.h>
-#include <
lib/dvb_si/tdt
.h>
+#include <
dvbsi++/time_date_section
.h>
class eDVBChannel;
class eDVBChannel;
+inline int fromBCD(int bcd)
+{
+ if ((bcd&0xF0)>=0xA0)
+ return -1;
+ if ((bcd&0xF)>=0xA)
+ return -1;
+ return ((bcd&0xF0)>>4)*10+(bcd&0xF);
+}
+
time_t parseDVBtime(__u8 t1, __u8 t2, __u8 t3, __u8 t4, __u8 t5);
class TDT: public eGTable
time_t parseDVBtime(__u8 t1, __u8 t2, __u8 t3, __u8 t4, __u8 t5);
class TDT: public eGTable
@@
-24,19
+33,22
@@
public:
class eDVBLocalTimeHandler: public Object
{
class eDVBLocalTimeHandler: public Object
{
+ struct channel_data
+ {
+ TDT *tdt;
+ ePtr<eDVBChannel> channel;
+ ePtr<eConnection> m_stateChangedConn;
+ };
friend class TDT;
DECLARE_REF(eDVBLocalTimeHandler)
friend class TDT;
DECLARE_REF(eDVBLocalTimeHandler)
- std::map<iDVBChannel*,
TDT*> m_active_table
s;
+ std::map<iDVBChannel*,
channel_data> m_knownChannel
s;
std::map<eDVBChannelID,int> m_timeOffsetMap;
ePtr<eConnection> m_chanAddedConn;
std::map<eDVBChannelID,int> m_timeOffsetMap;
ePtr<eConnection> m_chanAddedConn;
- ePtr<eConnection> m_chanRemovedConn;
- ePtr<eConnection> m_chanRunningConn;
bool m_time_ready;
int m_time_difference;
int m_last_tp_time_difference;
void DVBChannelAdded(eDVBChannel*);
bool m_time_ready;
int m_time_difference;
int m_last_tp_time_difference;
void DVBChannelAdded(eDVBChannel*);
- void DVBChannelRemoved(eDVBChannel*);
- void DVBChannelRunning(iDVBChannel*);
+ void DVBChannelStateChanged(iDVBChannel*);
void readTimeOffsetData(const char*);
void writeTimeOffsetData(const char*);
void updateTime(time_t tp_time, eDVBChannel*);
void readTimeOffsetData(const char*);
void writeTimeOffsetData(const char*);
void updateTime(time_t tp_time, eDVBChannel*);
@@
-45,8
+57,8
@@
public:
PSignal0<void> m_timeUpdated;
eDVBLocalTimeHandler();
~eDVBLocalTimeHandler();
PSignal0<void> m_timeUpdated;
eDVBLocalTimeHandler();
~eDVBLocalTimeHandler();
- bool ready() { return m_time_ready; }
- int difference() { return m_time_difference; }
+ bool ready()
const
{ return m_time_ready; }
+ int difference()
const
{ return m_time_difference; }
static eDVBLocalTimeHandler *getInstance() { return instance; }
};
static eDVBLocalTimeHandler *getInstance() { return instance; }
};