set frontend state to stateTuning when tuneloop starts.. ( to avoid false lostlock...

[enigma2.git] / lib / dvb / frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index dff3ddb9f99f076fe9423944c27b892af490599e..9d4061e66f045ea9651797eb8d5436c650594c3b 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -218,10 +218,11 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
 #endif
 {
 #if HAVE_DVB_API_VERSION < 3
+       sprintf(m_filename, "/dev/dvb/card%d/frontend%d", adap, fe);
        sprintf(m_sec_filename, "/dev/dvb/card%d/sec%d", adap, fe);
-#endif
+#else
        sprintf(m_filename, "/dev/dvb/adapter%d/frontend%d", adap, fe);
-
+#endif
        m_timeout = new eTimer(eApp);
        CONNECT(m_timeout->timeout, eDVBFrontend::timeout);
 
@@ -331,11 +332,11 @@ int eDVBFrontend::closeFrontend()
                        return -1;
                }
        }
-       eDebug("close frontend %d", m_fe);
-       setTone(iDVBFrontend::toneOff);
-       setVoltage(iDVBFrontend::voltageOff);
        if (m_fd >= 0)
        {
+               eDebug("close frontend %d", m_fe);
+               setTone(iDVBFrontend::toneOff);
+               setVoltage(iDVBFrontend::voltageOff);
                ::close(m_fd);
                m_fd=-1;
        }
@@ -399,9 +400,7 @@ void eDVBFrontend::feEvent(int w)
                        else
                        {
                                state = stateLostLock;
-
-                               if (m_state != stateLostLock)
-                                       eDebug("FIXME: we lost lock, so we might have to retune.");
+                               m_data[0] = m_data[1] = m_data[2] = -1; // reset diseqc
                        }
                }
                if (m_state != state)
@@ -519,10 +518,12 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                        ++m_sec_sequence.current();
                                break;
                        case eSecCommand::SET_VOLTAGE:
+                       {
                                int voltage = m_sec_sequence.current()++->voltage;
                                eDebug("[SEC] setVoltage %d", voltage);
                                setVoltage(voltage);
                                break;
+                       }
                        case eSecCommand::SET_TONE:
                                eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone);
                                setTone(m_sec_sequence.current()++->tone);
@@ -668,13 +669,6 @@ void eDVBFrontend::setFrontend()
                perror("FE_SET_FRONTEND failed");
                return;
        }
-
-       if (m_state != stateTuning)
-       {
-               m_tuning = 1;
-               m_state = stateTuning;
-               m_stateChanged(this);
-       }
        m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
 }
 
@@ -949,6 +943,13 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
        m_tuneTimer->start(0,true);
        m_sec_sequence.current() = m_sec_sequence.begin();
 
+       if (m_state != stateTuning)
+       {
+               m_tuning = 1;
+               m_state = stateTuning;
+               m_stateChanged(this);
+       }
+
        return 0;
 }