git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish dvb-s2 fec stuff
[enigma2.git]
/
lib
/
components
/
scan.cpp
diff --git
a/lib/components/scan.cpp
b/lib/components/scan.cpp
index 2f3c4d62a3593021a987550947603b65cd684c66..5355208f69dcdcac12542032fe6dfa4c1ffe10f0 100644
(file)
--- a/
lib/components/scan.cpp
+++ b/
lib/components/scan.cpp
@@
-8,7
+8,7
@@
DEFINE_REF(eComponentScan);
void eComponentScan::scanEvent(int evt)
{
void eComponentScan::scanEvent(int evt)
{
-
eDebug("scan event %d!", evt);
+
//
eDebug("scan event %d!", evt);
if (evt == eDVBScan::evtFinish)
{
if (evt == eDVBScan::evtFinish)
{
@@
-33,6
+33,12
@@
void eComponentScan::scanEvent(int evt)
}
}
}
}
+ if (evt == eDVBScan::evtNewService)
+ {
+ newService();
+ return;
+ }
+
if (evt == eDVBScan::evtFail)
{
eDebug("scan failed.");
if (evt == eDVBScan::evtFail)
{
eDebug("scan failed.");
@@
-78,7
+84,7
@@
void eComponentScan::addInitial(const eDVBFrontendParametersTerrestrial &p)
}
}
-int eComponentScan::start(int flags)
+int eComponentScan::start(int f
eid, int f
lags)
{
if (m_initial.empty())
return -2;
{
if (m_initial.empty())
return -2;
@@
-93,15
+99,15
@@
int eComponentScan::start(int flags)
eUsePtr<iDVBChannel> channel;
eUsePtr<iDVBChannel> channel;
- if (mgr->allocateRawChannel(channel))
+ if (mgr->allocateRawChannel(channel
, feid
))
{
{
- eDebug("scan: allocating raw channel
failed!"
);
+ eDebug("scan: allocating raw channel
(on frontend %d) failed!", feid
);
return -1;
}
std::list<ePtr<iDVBFrontendParameters> > list;
return -1;
}
std::list<ePtr<iDVBFrontendParameters> > list;
- m_scan = new eDVBScan(channel);
+ m_scan = new eDVBScan(channel
, true
);
m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);
m_scan->start(m_initial, flags);
m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);
m_scan->start(m_initial, flags);
@@
-137,3
+143,10
@@
int eComponentScan::getError()
{
return m_failed;
}
{
return m_failed;
}
+
+void eComponentScan::getLastServiceName(std::string &string)
+{
+ if (!m_scan)
+ return;
+ m_scan->getLastServiceName(string);
+}