git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ok and cancel in the timer editor
[enigma2.git]
/
lib
/
dvb
/
scan.h
diff --git
a/lib/dvb/scan.h
b/lib/dvb/scan.h
index 743ea8d963f272fda92122bc4c497ba8d1e5f3ee..11d0efdcdabb2f45a98890fc389e15e8aae05d29 100644
(file)
--- a/
lib/dvb/scan.h
+++ b/
lib/dvb/scan.h
@@
-1,9
+1,9
@@
#ifndef __lib_dvb_scan_h
#define __lib_dvb_scan_h
#ifndef __lib_dvb_scan_h
#define __lib_dvb_scan_h
-#include <
lib/dvb_si/nit
.h>
-#include <
lib/dvb_si/sdt
.h>
-#include <
lib/dvb_si/bat
.h>
+#include <
dvbsi++/network_information_section
.h>
+#include <
dvbsi++/service_description_section
.h>
+#include <
dvbsi++/bouquet_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>
@@
-15,7
+15,7
@@
private:
/* chid helper functions: */
/* heuristically determine if onid/tsid is valid */
/* chid helper functions: */
/* heuristically determine if onid/tsid is valid */
- int isValidONIDTSID(eOriginalNetworkID onid, eTransportStreamID tsid);
+ int isValidONIDTSID(
int orbital_position,
eOriginalNetworkID onid, eTransportStreamID tsid);
/* build dvb namespace */
eDVBNamespace buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash);
/* build dvb namespace */
eDVBNamespace buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash);
@@
-31,12
+31,12
@@
private:
RESULT nextChannel();
RESULT startFilter();
RESULT nextChannel();
RESULT startFilter();
- enum { readySDT=1, readyNIT=2, readyBAT=4,
readyAll=7,
+ enum { readySDT=1, readyNIT=2, readyBAT=4,
validSDT=8, validNIT=16, validBAT=32};
/* scan state variables */
int m_channel_state;
validSDT=8, validNIT=16, validBAT=32};
/* scan state variables */
int m_channel_state;
- int m_ready;
+ int m_ready
, m_ready_all
;
std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> > m_new_channels;
std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_new_services;
std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> > m_new_channels;
std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_new_services;
@@
-45,9
+45,9
@@
private:
ePtr<iDVBFrontendParameters> m_ch_current;
eDVBChannelID m_chid_current;
ePtr<iDVBFrontendParameters> m_ch_current;
eDVBChannelID m_chid_current;
- ePtr<eTable<ServiceDescription
Table
> > m_SDT;
- ePtr<eTable<NetworkInformation
Table
> > m_NIT;
- ePtr<eTable<BouquetAssociation
Table
> > m_BAT;
+ ePtr<eTable<ServiceDescription
Section
> > m_SDT;
+ ePtr<eTable<NetworkInformation
Section
> > m_NIT;
+ ePtr<eTable<BouquetAssociation
Section
> > m_BAT;
void SDTready(int err);
void NITready(int err);
void SDTready(int err);
void NITready(int err);
@@
-60,15
+60,18
@@
private:
void channelDone();
Signal1<void,int> m_event;
void channelDone();
Signal1<void,int> m_event;
- RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt);
+ RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt);
+
+ int m_flags;
public:
eDVBScan(iDVBChannel *channel);
~eDVBScan();
public:
eDVBScan(iDVBChannel *channel);
~eDVBScan();
- void start(const std::list<ePtr<iDVBFrontendParameters> > &known_transponders);
+ enum { scanNetworkSearch = 1, scanSearchBAT = 2 };
+ void start(const eSmartPtrList<iDVBFrontendParameters> &known_transponders, int flags);
enum { evtUpdate, evtFinish, evtFail };
enum { evtUpdate, evtFinish, evtFail };
- RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection);
+
RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection);
void insertInto(iDVBChannelList *db);
void getStats(int &transponders_done, int &transponders_total, int &services);
void insertInto(iDVBChannelList *db);
void getStats(int &transponders_done, int &transponders_total, int &services);