diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-07-16 16:17:31 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-07-16 16:17:31 +0000 |
| commit | fdad4815a5c267a5f20f10604617b833d85ec32e (patch) | |
| tree | 964224aa46557bcc9a9e8ba8b071b0a26d25ef5e /lib/dvb/frontend.cpp | |
| parent | 8b7bd9c03984b5f534a0c50561621c1368d926da (diff) | |
| download | enigma2-fdad4815a5c267a5f20f10604617b833d85ec32e.tar.gz enigma2-fdad4815a5c267a5f20f10604617b833d85ec32e.zip | |
fix no more working sec with old api
fix get video pts for old api
Diffstat (limited to 'lib/dvb/frontend.cpp')
| -rw-r--r-- | lib/dvb/frontend.cpp | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 04b794d4..1906a8f4 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -449,21 +449,6 @@ int eDVBFrontend::openFrontend() { case FE_QPSK: m_type = iDVBFrontend::feSatellite; -#if HAVE_DVB_API_VERSION < 3 - if (m_secfd < 0) - { - m_secfd = ::open(m_sec_filename, O_RDWR); - if (m_secfd < 0) - { - eWarning("failed! (%s) %m", m_sec_filename); - ::close(m_fd); - m_fd=-1; - return -1; - } - } - else - eWarning("sec %d already opened", m_dvbid); -#endif break; case FE_QAM: m_type = iDVBFrontend::feCable; @@ -480,6 +465,25 @@ int eDVBFrontend::openFrontend() eDebug("detected %s frontend", "satellite\0cable\0 terrestrial"+fe_info.type*10); } +#if HAVE_DVB_API_VERSION < 3 + if (m_type == iDVBFrontend::feSatellite) + { + if (m_secfd < 0) + { + m_secfd = ::open(m_sec_filename, O_RDWR); + if (m_secfd < 0) + { + eWarning("failed! (%s) %m", m_sec_filename); + ::close(m_fd); + m_fd=-1; + return -1; + } + } + else + eWarning("sec %d already opened", m_dvbid); + } +#endif + setTone(iDVBFrontend::toneOff); setVoltage(iDVBFrontend::voltageOff); |
