remove nonexisting bug

[enigma2.git] / lib / components / scan.cpp

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index c82d04efa39547ffc139a9c024af51d13149111f..fc2470f7a735947d3a1bfe06def7d40a34f21633 100644 (file)
--- a/lib/components/scan.cpp
+++ b/lib/components/scan.cpp
@@ -50,8 +50,38 @@ eComponentScan::~eComponentScan()
 {
 }
 
+void eComponentScan::clear()
+{
+       m_initial.clear();
+}
+
+void eComponentScan::addInitial(const eDVBFrontendParametersSatellite &p)
+{
+       ePtr<eDVBFrontendParameters> parm = new eDVBFrontendParameters();
+       parm->setDVBS(p);
+       m_initial.push_back(parm);
+}
+
+void eComponentScan::addInitial(const eDVBFrontendParametersCable &p)
+{
+       ePtr<eDVBFrontendParameters> parm = new eDVBFrontendParameters();
+       parm->setDVBC(p);
+       m_initial.push_back(parm);
+}
+
+void eComponentScan::addInitial(const eDVBFrontendParametersTerrestrial &p)
+{
+       ePtr<eDVBFrontendParameters> parm = new eDVBFrontendParameters();
+       parm->setDVBT(p);
+       m_initial.push_back(parm);
+}
+
+
 int eComponentScan::start()
 {
+       if (m_initial.empty())
+               return -2;
+
        if (m_done != -1)
                return -1;
        
@@ -60,8 +90,9 @@ int eComponentScan::start()
        
        eDVBResourceManager::getInstance(mgr);
 
-       eDVBFrontendParameters *fe = new eDVBFrontendParameters();
-#if 0  
+#if 0 
+       ePtr<eDVBFrontendParameters> fe = new eDVBFrontendParameters();
+#if 1
        eDVBFrontendParametersSatellite fesat;
                
        fesat.frequency = 11817000; // 12070000;
@@ -73,8 +104,8 @@ int eComponentScan::start()
 
        
        fe->setDVBS(fesat);
-#endif
 
+#else
        eDVBFrontendParametersTerrestrial fet;
        fet.frequency = 626000000;
        fet.inversion = eDVBFrontendParametersTerrestrial::Inversion::Unknown;
@@ -85,20 +116,23 @@ int eComponentScan::start()
        fet.guard_interval = eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32;
        fet.hierarchy = eDVBFrontendParametersTerrestrial::Hierarchy::HNone;
        fe->setDVBT(fet);
-       
-       ePtr<iDVBChannel> channel;
+#endif
+#endif
+
+       eUsePtr<iDVBChannel> channel;
 
        if (mgr->allocateRawChannel(channel))
+       {
                eDebug("scan: allocating raw channel failed!");
+               return -1;
+       }
 
        std::list<ePtr<iDVBFrontendParameters> > list;
                
-       list.push_back(fe);
-       
        m_scan = new eDVBScan(channel);
        m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);
-       m_scan->start(list);
-
+       m_scan->start(m_initial);
+       
        return 0;
 }
 
@@ -126,3 +160,8 @@ int eComponentScan::isDone()
 {
        return m_done;
 }
+
+int eComponentScan::getError()
+{
+       return m_failed;
+}