add 'none' hierarchy

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

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index eba474e8046d031060f643d214c60e9c84fe15f3..1fa3cafe4c398dea32049f637adb131ddbe96cc8 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -422,8 +422,11 @@ int eDVBFrontend::closeFrontend()
        if (m_fd >= 0)
        {
                eDebug("close frontend %d", m_fe);
+               m_tuneTimer->stop();
                setTone(iDVBFrontend::toneOff);
                setVoltage(iDVBFrontend::voltageOff);
+               if (m_sec)
+                       m_sec->setRotorMoving(false);
                ::close(m_fd);
                m_fd=-1;
                m_data[0] = m_data[1] = m_data[2] = -1;
@@ -800,6 +803,9 @@ void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
        PutToDict(dict, "guard_interval", tmp);
        switch (parm_u_ofdm_hierarchy_information)
        {
+               case HIERARCHY_NONE:
+                       tmp = "HIERARCHY_NONE";
+                       break;
                case HIERARCHY_1:
                        tmp = "HIERARCHY_1";
                        break;
@@ -1465,6 +1471,9 @@ RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial
        }
        switch (feparm.hierarchy)
        {
+               case eDVBFrontendParametersTerrestrial::Hierarchy::HNone:
+                       parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
+                       break;
                case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
                        parm_u_ofdm_hierarchy_information = HIERARCHY_1;
                        break;
@@ -1507,6 +1516,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                        return -EINVAL;
                }
                res=prepare_sat(feparm);
+               m_sec->setRotorMoving(false);
                break;
        }
        case feCable: