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 scan: initial transponder wasn't used.
[enigma2.git]
/
lib
/
dvb
/
scan.h
diff --git
a/lib/dvb/scan.h
b/lib/dvb/scan.h
index 96264e887b73798568e3170e33f2c68639c1b347..743ea8d963f272fda92122bc4c497ba8d1e5f3ee 100644
(file)
--- a/
lib/dvb/scan.h
+++ b/
lib/dvb/scan.h
@@
-4,13
+4,13
@@
#include <lib/dvb_si/nit.h>
#include <lib/dvb_si/sdt.h>
#include <lib/dvb_si/bat.h>
#include <lib/dvb_si/nit.h>
#include <lib/dvb_si/sdt.h>
#include <lib/dvb_si/bat.h>
-#include <lib/dvb/i
section
.h>
+#include <lib/dvb/i
demux
.h>
#include <lib/dvb/esection.h>
#include <lib/dvb/db.h>
class eDVBScan: public Object, public iObject
{
#include <lib/dvb/esection.h>
#include <lib/dvb/db.h>
class eDVBScan: public Object, public iObject
{
-DECLARE_REF;
+DECLARE_REF
(eDVBScan)
;
private:
/* chid helper functions: */
private:
/* chid helper functions: */
@@
-20,7
+20,7
@@
private:
eDVBNamespace buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash);
/* scan resources */
eDVBNamespace buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash);
/* scan resources */
- ePtr<iDVBChannel> m_channel;
+ e
Use
Ptr<iDVBChannel> m_channel;
ePtr<iDVBDemux> m_demux;
/* infrastructure */
ePtr<iDVBDemux> m_demux;
/* infrastructure */
@@
-43,6
+43,7
@@
private:
std::list<ePtr<iDVBFrontendParameters> > m_ch_toScan, m_ch_scanned, m_ch_unavailable;
ePtr<iDVBFrontendParameters> m_ch_current;
std::list<ePtr<iDVBFrontendParameters> > m_ch_toScan, m_ch_scanned, m_ch_unavailable;
ePtr<iDVBFrontendParameters> m_ch_current;
+ eDVBChannelID m_chid_current;
ePtr<eTable<ServiceDescriptionTable> > m_SDT;
ePtr<eTable<NetworkInformationTable> > m_NIT;
ePtr<eTable<ServiceDescriptionTable> > m_SDT;
ePtr<eTable<NetworkInformationTable> > m_NIT;
@@
-52,7
+53,8
@@
private:
void NITready(int err);
void BATready(int err);
void NITready(int err);
void BATready(int err);
- void addChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm);
+ void addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm);
+ void addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm);
int sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const;
void channelDone();
int sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const;
void channelDone();