fix modulation for qam in old api

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

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 75824f03a201535b147ee5ffb3fea6538c54b6a9..6910b19e17c58e3febc55b2e52fe56d063dc3a90 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -275,7 +275,7 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_fe(fe), m_c
                ok = 0;
                return;
        }
-       eDebug("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*9);
+       eDebug("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*10);
        ok = 1;
 
        m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
@@ -649,34 +649,41 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
                if (where.getDVBC(feparm))
                        return -EINVAL;
 #if HAVE_DVB_API_VERSION < 3
-               parm.Frequency = feparm.frequency;
+               parm.Frequency = feparm.frequency * 1000;
+               parm.u.qam.SymbolRate = feparm.symbol_rate;
 #else
-               parm.frequency = feparm.frequency;
+               parm.frequency = feparm.frequency * 1000;
+               parm.u.qam.symbol_rate = feparm.symbol_rate;
 #endif
 
-               parm.u.qam.symbol_rate = feparm.symbol_rate;
 
+               fe_modulation_t mod;
                switch (feparm.modulation)
                {
                case eDVBFrontendParametersCable::Modulation::QAM16:
-                       parm.u.qam.modulation = QAM_16;
+                       mod = QAM_16;
                        break;
                case eDVBFrontendParametersCable::Modulation::QAM32:
-                       parm.u.qam.modulation = QAM_32;
+                       mod = QAM_32;
                        break;
                case eDVBFrontendParametersCable::Modulation::QAM64:
-                       parm.u.qam.modulation = QAM_64;
+                       mod = QAM_64;
                        break;
                case eDVBFrontendParametersCable::Modulation::QAM128:
-                       parm.u.qam.modulation = QAM_128;
+                       mod = QAM_128;
                        break;
                case eDVBFrontendParametersCable::Modulation::QAM256:
-                       parm.u.qam.modulation = QAM_256;
+                       mod = QAM_256;
                        break;                  
                case eDVBFrontendParametersCable::Modulation::Auto:
-                       parm.u.qam.modulation = QAM_AUTO;
+                       mod = QAM_AUTO;
                        break;                  
                }
+#if HAVE_DVB_API_VERSION < 3
+               parm.u.qam.QAM = mod;
+#else
+               parm.u.qam.modulation = mod;
+#endif
                switch (feparm.modulation)
                {               
                case eDVBFrontendParametersCable::Inversion::On: