add ability to get ttxpid from python

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

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index a081a37ff81a647c67507c1ed5dc102c556aa76c..a4a94a213de8fe78ac3537de8424d3a52385ba2c 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,9 +332,11 @@ int eDVBFrontend::closeFrontend()
                        return -1;
                }
        }
-       eDebug("close frontend %d", m_fe);
        if (m_fd >= 0)
        {
+               eDebug("close frontend %d", m_fe);
+               setTone(iDVBFrontend::toneOff);
+               setVoltage(iDVBFrontend::voltageOff);
                ::close(m_fd);
                m_fd=-1;
        }
@@ -347,8 +350,6 @@ int eDVBFrontend::closeFrontend()
        delete m_sn;
        m_sn=0;
 
-       setTone(iDVBFrontend::toneOff);
-       setVoltage(iDVBFrontend::voltageOff);
        return 0;
 }
 
@@ -519,10 +520,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);