remove new found flags when do a automatic scan and "clear before scan" was

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

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index c21e8f4bf3a706e5fa81b80c7696cac956e69ae1..a863d92323695db6ddda03041bc720002043309f 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)
        {


@@ -106,14 +106,59 @@ int eComponentScan::start(int feid, int flags)
        }
 
        std::list<ePtr<iDVBFrontendParameters> > list;
        }
 
        std::list<ePtr<iDVBFrontendParameters> > list;

-               

        m_scan = new eDVBScan(channel);
        m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);
        m_scan = new eDVBScan(channel);
        m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);

+
+       if (!(flags & scanRemoveServices))
+       {
+               ePtr<iDVBChannelList> db;
+               ePtr<eDVBResourceManager> res;
+               int err;
+               if ((err = eDVBResourceManager::getInstance(res)) != 0)
+                       eDebug("no resource manager");
+               else if ((err = res->getChannelList(db)) != 0)
+                       eDebug("no channel list");
+               else
+               {
+                       if (m_initial.size() > 1)
+                       {
+                               iDVBFrontendParameters *tp = m_initial.first();
+                               int type;
+                               if (tp && !tp->getSystem(type))
+                               {
+                                       switch(type)
+                                       {
+                                               case iDVBFrontend::feSatellite:
+                                               {
+                                                       eDVBFrontendParametersSatellite parm;
+                                                       tp->getDVBS(parm);
+                                                       db->removeFlags(eDVBService::dxNewFound, -1, -1, -1, parm.orbital_position);
+                                                       break;
+                                               }
+                                               case iDVBFrontend::feCable:
+                                                       db->removeFlags(eDVBService::dxNewFound, 0xFFFF0000, -1, -1, -1);
+                                                       break;
+                                               case iDVBFrontend::feTerrestrial:
+                                                       db->removeFlags(eDVBService::dxNewFound, 0xEEEE0000, -1, -1, -1);
+                                                       break;
+                                       }
+                               }
+                       }
+               }
+       }

        m_scan->start(m_initial, flags);
        m_scan->start(m_initial, flags);

-       
+

        return 0;
 }
 
        return 0;
 }
 

+RESULT eComponentScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+       if (m_scan)
+               return m_scan->getFrontend(fe);
+       fe = 0;
+       return -1;
+}
+

 int eComponentScan::getProgress()
 {
        if (!m_scan)
 int eComponentScan::getProgress()
 {
        if (!m_scan)