fix wrap around with enabled movemode

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

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index ad2e4d1aff2446e5422bde8422fffe3dce51b364..c21e8f4bf3a706e5fa81b80c7696cac956e69ae1 100644 (file)
--- a/lib/components/scan.cpp
+++ b/lib/components/scan.cpp
@@ -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.");
@@ -50,8 +57,38 @@ eComponentScan::~eComponentScan()
 {
 }
 
-int eComponentScan::start()
+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(int feid, int flags)
 {
+       if (m_initial.empty())
+               return -2;
+
        if (m_done != -1)
                return -1;
        
@@ -60,47 +97,19 @@ int eComponentScan::start()
        
        eDVBResourceManager::getInstance(mgr);
 
-       eDVBFrontendParameters *fe = new eDVBFrontendParameters();
-#if 0  
-       eDVBFrontendParametersSatellite fesat;
-               
-       fesat.frequency = 11817000; // 12070000;
-       fesat.symbol_rate = 27500000;
-       fesat.polarisation = eDVBFrontendParametersSatellite::Polarisation::Vertical;
-       fesat.fec = eDVBFrontendParametersSatellite::FEC::f3_4;
-       fesat.inversion = eDVBFrontendParametersSatellite::Inversion::Off;
-       fesat.orbital_position = 192;
+       eUsePtr<iDVBChannel> channel;
 
-       
-       fe->setDVBS(fesat);
-#endif
-
-       eDVBFrontendParametersTerrestrial fet;
-       fet.frequency = 626000000;
-       fet.inversion = eDVBFrontendParametersTerrestrial::Inversion::Unknown;
-       fet.bandwidth = eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz;
-       fet.code_rate_HP = fet.code_rate_LP = eDVBFrontendParametersTerrestrial::FEC::fAuto;
-       fet.modulation = eDVBFrontendParametersTerrestrial::Modulation::QAM16;
-       fet.transmission_mode = eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k;
-       fet.guard_interval = eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32;
-       fet.hierarchy = eDVBFrontendParametersTerrestrial::Hierarchy::HNone;
-       fe->setDVBT(fet);
-       
-       ePtr<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;
                
-       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, flags);
        
        return 0;
 }
@@ -134,3 +143,10 @@ int eComponentScan::getError()
 {
        return m_failed;
 }
+
+void eComponentScan::getLastServiceName(std::string &string)
+{
+       if (!m_scan)
+               return;
+       m_scan->getLastServiceName(string);
+}