add support for Linkage services ( Premiere Subservices )

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

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 48eb971d516e069529def99279f7cc5599f628ee..4842945c8c16e84dbf8525f7dcfb7d7ac0dcc5c6 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -21,14 +21,14 @@ DEFINE_REF(eDVBSatelliteEquipmentControl);
 eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance;
 
 eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends)
-       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends)
+       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_rotorMoving(false)
 {
        if (!instance)
                instance = this;
 
        clear();
 
-#if 0
+#if 1
 // ASTRA
        addLNB();
        setLNBTunerMask(3);
@@ -62,7 +62,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        addSatellite(130);
        setVoltageMode(eDVBSatelliteSwitchParameters::HV);
        setToneMode(eDVBSatelliteSwitchParameters::HILO);
-#endif
+#else
 
 // Rotor
        addLNB();
@@ -103,6 +103,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setVoltageMode(eDVBSatelliteSwitchParameters::HV);
        setToneMode(eDVBSatelliteSwitchParameters::HILO);
        setRotorPosNum(1); // stored pos 1
+#endif
 }
 
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
@@ -183,7 +184,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                it->m_frontend->getData(1, oucsw);
                                                it->m_frontend->getData(2, oToneburst);
                                                it->m_frontend->getData(6, oRotorPos);
-
+#if 0
                                                eDebug("compare csw %02x == lcsw %02x",
                                                        csw, ocsw);
                                                if ( diseqc )
@@ -192,16 +193,16 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                if ( rotor )
                                                        eDebug("compare pos %d == current pos %d",
                                                                sat.orbital_position, oRotorPos);
-
+#endif
                                                if ( (csw != ocsw) ||
                                                        ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
                                                        ( rotor && oRotorPos != sat.orbital_position ) )
                                                {
-                                                       eDebug("can not tune this transponder with linked tuner in use!!");
+//                                                     eDebug("can not tune this transponder with linked tuner in use!!");
                                                        ret=0;
                                                }
-                                               else
-                                                       eDebug("OK .. can tune this transponder with linked tuner in use :)");
+//                                             else
+//                                                     eDebug("OK .. can tune this transponder with linked tuner in use :)");
                                        }
                                }
                        }
@@ -460,7 +461,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                RotorCmd=sw_param.m_rotorPosNum;
                                        else  // we must calc gotoxx cmd
                                        {
-                                               eDebug("Entry for %d,%d° not in Rotor Table found... i try gotoXX°", sat.orbital_position / 10, sat.orbital_position % 10 );
+                                               eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
                                                useGotoXX = true;
 
                                                int satDir = sat.orbital_position < 0 ?
@@ -935,3 +936,13 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
        }
        return -1;
 }
+
+bool eDVBSatelliteEquipmentControl::isRotorMoving()
+{
+       return m_rotorMoving;
+}
+
+void eDVBSatelliteEquipmentControl::setRotorMoving(bool b)
+{
+       m_rotorMoving=b;
+}