update languages: es, nl

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

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 3e2efbe7cfba07752395815f4dda1fd353d992cd..6db2d0915d60eb9114789b457af67ef1fc4dd058 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -53,8 +53,10 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
-void eDVBDiseqcCommand::setData(const char *str)
+void eDVBDiseqcCommand::setCommandString(const char *str)
 {
+       if (!str)
+               return;
        len = strlen(str);
        if (len > MAX_DISEQC_LENGTH)
                len = MAX_DISEQC_LENGTH;
@@ -369,7 +371,6 @@ int eDVBFrontend::openFrontend()
 
        m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
        CONNECT(m_sn->activated, eDVBFrontend::feEvent);
-       m_sn->start();
 
        return 0;
 }
@@ -1173,6 +1174,8 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 void eDVBFrontend::setFrontend()
 {
        eDebug("setting frontend %d", m_fe);
+       m_sn->start();
+       feEvent(-1);
        if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
        {
                perror("FE_SET_FRONTEND failed");
@@ -1452,13 +1455,14 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
        eDebug("(%d)tune", m_fe);
 
+       m_timeout->stop();
+
        int res=0;
 
        if (m_type == -1)
                return -ENODEV;
 
-       feEvent(-1);
-
+       m_sn->stop();
        m_sec_sequence.clear();
 
        switch (m_type)
@@ -1481,7 +1485,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                        return -EINVAL;
                res=prepare_cable(feparm);
                if (!res)
+               {
+                       m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+               }
                break;
        }
        case feTerrestrial:
@@ -1494,7 +1501,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                }
                res=prepare_terrestrial(feparm);
                if (!res)
+               {
+                       m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
                        m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+               }
                break;
        }
        }
@@ -1502,7 +1512,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
        if (!res)  // prepare ok
        {
                m_tuneTimer->start(0,true);
-               m_timeout->stop();
                m_sec_sequence.current() = m_sec_sequence.begin();
 
                if (m_state != stateTuning)