git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use new/delete instead of malloc/free
[enigma2.git]
/
lib
/
dvb
/
esection.h
diff --git
a/lib/dvb/esection.h
b/lib/dvb/esection.h
index 78895e769ee398f9d42ef8ca71ef931858bd43bb..88c652a0ef0f525e8ff101a916312f52ea22cffe 100644
(file)
--- a/
lib/dvb/esection.h
+++ b/
lib/dvb/esection.h
@@
-1,16
+1,18
@@
#ifndef __esection_h
#define __esection_h
#ifndef __esection_h
#define __esection_h
-#include <lib/dvb/i
section
.h>
+#include <lib/dvb/i
demux
.h>
#include <set>
class eGTable: public iObject, public Object
{
#include <set>
class eGTable: public iObject, public Object
{
-DECLARE_REF;
+DECLARE_REF
(eGTable)
;
private:
ePtr<iDVBSectionReader> m_reader;
eDVBTableSpec m_table;
private:
ePtr<iDVBSectionReader> m_reader;
eDVBTableSpec m_table;
+ unsigned int m_tries;
+
eTimer *m_timeout;
void sectionRead(const __u8 *data);
eTimer *m_timeout;
void sectionRead(const __u8 *data);
@@
-38,25
+40,33
@@
private:
protected:
int createTable(int nr, const __u8 *data, unsigned int max)
{
protected:
int createTable(int nr, const __u8 *data, unsigned int max)
{
+ int ssize = sections.size();
+ if (max < ssize || nr >= max)
+ {
+ eDebug("kaputt max(%d) < ssize(%d) || nr(%d) >= max(%d)",
+ max, ssize, nr, max);
+ return 0;
+ }
if (avail.find(nr) != avail.end())
delete sections[nr];
if (avail.find(nr) != avail.end())
delete sections[nr];
+
sections.resize(max);
sections.resize(max);
-
-
sections[nr] = new Section(data);
avail.insert(nr);
for (unsigned int i = 0; i < max; ++i)
if (avail.find(i) != avail.end())
sections[nr] = new Section(data);
avail.insert(nr);
for (unsigned int i = 0; i < max; ++i)
if (avail.find(i) != avail.end())
-
printf
("+");
+
eDebugNoNewLine
("+");
else
else
-
printf
("-");
+
eDebugNoNewLine
("-");
-
printf(" %d/%d\n", avail.size(), max
);
+
eDebug(" %d/%d TID %02x", avail.size(), max, data[0]
);
if (avail.size() == max)
if (avail.size() == max)
+ {
+ eDebug("done!");
return 1;
return 1;
- else
+
}
else
return 0;
}
public:
return 0;
}
public:
@@
-66,8
+76,8
@@
public:
}
~eTable()
{
}
~eTable()
{
- for (
typename std::vector<Section*>::iterator i(sections.begin()); i != sections
.end(); ++i)
- delete
*i
;
+ for (
std::set<int>::iterator i(avail.begin()); i != avail
.end(); ++i)
+ delete
sections[*i]
;
}
};
}
};
@@
-95,7
+105,13
@@
public:
~eAUTable()
{
~eAUTable()
{
- current=next=0;
+ stop();
+ }
+
+ void stop()
+ {
+ current = next = 0;
+ m_demux = 0;
}
int begin(eMainloop *m, const eDVBTableSpec &spec, ePtr<iDVBDemux> demux)
}
int begin(eMainloop *m, const eDVBTableSpec &spec, ePtr<iDVBDemux> demux)