add ability to select in scan what is todo with existing services (Clear before scan)
[enigma2.git] / lib / components / scan.cpp
index 6676af5..c21e8f4 100644 (file)
@@ -28,10 +28,17 @@ void eComponentScan::scanEvent(int evt)
                } else
                {
                        m_scan->insertInto(db);
+                       db->flush();
                        eDebug("scan done!");
                }
        }
        
+       if (evt == eDVBScan::evtNewService)
+       {
+               newService();
+               return;
+       }
+       
        if (evt == eDVBScan::evtFail)
        {
                eDebug("scan failed.");
@@ -77,7 +84,7 @@ void eComponentScan::addInitial(const eDVBFrontendParametersTerrestrial &p)
 }
 
 
-int eComponentScan::start(int flags)
+int eComponentScan::start(int feid, int flags)
 {
        if (m_initial.empty())
                return -2;
@@ -92,9 +99,9 @@ int eComponentScan::start(int flags)
 
        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;
        }
 
@@ -136,3 +143,10 @@ int eComponentScan::getError()
 {
        return m_failed;
 }
+
+void eComponentScan::getLastServiceName(std::string &string)
+{
+       if (!m_scan)
+               return;
+       m_scan->getLastServiceName(string);
+}