git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fix
[enigma2.git]
/
lib
/
dvb
/
scan.h
diff --git
a/lib/dvb/scan.h
b/lib/dvb/scan.h
index fe5e0686fadbbd11ccf620e6a83e2ccea65eba07..96a1528d735a94dae4bddf1d8afbaf454bbd60f9 100644
(file)
--- a/
lib/dvb/scan.h
+++ b/
lib/dvb/scan.h
@@
-1,9
+1,10
@@
#ifndef __lib_dvb_scan_h
#define __lib_dvb_scan_h
#ifndef __lib_dvb_scan_h
#define __lib_dvb_scan_h
-#include <dvbsi++/network_information_section.h>
#include <dvbsi++/service_description_section.h>
#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/network_information_section.h>
#include <dvbsi++/bouquet_association_section.h>
#include <dvbsi++/bouquet_association_section.h>
+#include <dvbsi++/program_association_section.h>
#include <lib/dvb/idemux.h>
#include <lib/dvb/esection.h>
#include <lib/dvb/db.h>
#include <lib/dvb/idemux.h>
#include <lib/dvb/esection.h>
#include <lib/dvb/db.h>
@@
-31,8
+32,8
@@
private:
RESULT nextChannel();
RESULT startFilter();
RESULT nextChannel();
RESULT startFilter();
- enum { ready
SDT=1, readyNIT=2, readyBAT=4
,
- valid
SDT=8, validNIT=16, validBAT=32
};
+ enum { ready
PAT=1, readySDT=2, readyNIT=4, readyBAT=8
,
+ valid
PAT=16, validSDT=32, validNIT=64, validBAT=128
};
/* scan state variables */
int m_channel_state;
/* scan state variables */
int m_channel_state;
@@
-49,26
+50,34
@@
private:
ePtr<eTable<ServiceDescriptionSection> > m_SDT;
ePtr<eTable<NetworkInformationSection> > m_NIT;
ePtr<eTable<BouquetAssociationSection> > m_BAT;
ePtr<eTable<ServiceDescriptionSection> > m_SDT;
ePtr<eTable<NetworkInformationSection> > m_NIT;
ePtr<eTable<BouquetAssociationSection> > m_BAT;
-
+ ePtr<eTable<ProgramAssociationSection> > m_PAT;
+
void SDTready(int err);
void NITready(int err);
void BATready(int err);
void SDTready(int err);
void NITready(int err);
void BATready(int err);
-
+ void PATready(int err);
+
void addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm);
void addChannelToScan(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;
-
+
+ int sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2, bool exact=false) const;
+
void channelDone();
Signal1<void,int> m_event;
RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt);
int m_flags;
void channelDone();
Signal1<void,int> m_event;
RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt);
int m_flags;
+ bool m_usePAT;
public:
public:
- eDVBScan(iDVBChannel *channel, bool
debug=false
);
+ eDVBScan(iDVBChannel *channel, bool
usePAT=true, bool debug=true
);
~eDVBScan();
~eDVBScan();
- enum { scanNetworkSearch = 1, scanSearchBAT = 2, scanRemoveServices = 4, scanDontRemoveFeeds=8 };
+ enum {
+ scanNetworkSearch = 1, scanSearchBAT = 2,
+ scanRemoveServices = 4, scanDontRemoveFeeds = 8,
+ clearToScanOnFirstNIT = 16 };
+
void start(const eSmartPtrList<iDVBFrontendParameters> &known_transponders, int flags);
enum { evtUpdate, evtNewService, evtFinish, evtFail };
void start(const eSmartPtrList<iDVBFrontendParameters> &known_transponders, int flags);
enum { evtUpdate, evtNewService, evtFinish, evtFail };