X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1578c510eba1e58dae172b4b594cdaf263e988f0..d250965754894689707739e6d12d7cf6a6f13d5e:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index a081a37f..a4a94a21 100644
--- 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);