git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set frontend state to stateTuning when tuneloop starts.. ( to avoid false lostlock...
[enigma2.git]
/
lib
/
dvb
/
sec.h
diff --git
a/lib/dvb/sec.h
b/lib/dvb/sec.h
index 901e4e2ea8565d3601db836bb444cad23c2b0bd2..8a51f3318f406920a187d9f3960f30c76fd00876 100644
(file)
--- a/
lib/dvb/sec.h
+++ b/
lib/dvb/sec.h
@@
-109,17
+109,21
@@
public:
return secSequence.size();
}
};
return secSequence.size();
}
};
+#endif
class eDVBSatelliteDiseqcParameters
{
class eDVBSatelliteDiseqcParameters
{
+#ifdef SWIG
+ eDVBSatelliteDiseqcParameters();
+ ~eDVBSatelliteDiseqcParameters();
+#endif
public:
enum { AA=0, AB=1, BA=2, BB=3, SENDNO=4 /* and 0xF0 .. 0xFF*/ }; // DiSEqC Parameter
public:
enum { AA=0, AB=1, BA=2, BB=3, SENDNO=4 /* and 0xF0 .. 0xFF*/ }; // DiSEqC Parameter
- __u8 m_committed_cmd;
-
enum t_diseqc_mode { NONE=0, V1_0=1, V1_1=2, V1_2=3, SMATV=4 }; // DiSEqC Mode
enum t_diseqc_mode { NONE=0, V1_0=1, V1_1=2, V1_2=3, SMATV=4 }; // DiSEqC Mode
- t_diseqc_mode m_diseqc_mode;
-
enum t_toneburst_param { NO=0, A=1, B=2 };
enum t_toneburst_param { NO=0, A=1, B=2 };
+#ifndef SWIG
+ __u8 m_committed_cmd;
+ t_diseqc_mode m_diseqc_mode;
t_toneburst_param m_toneburst_param;
__u8 m_repeats; // for cascaded switches
t_toneburst_param m_toneburst_param;
__u8 m_repeats; // for cascaded switches
@@
-135,23
+139,34
@@
public:
4) uncommitted, committed, toneburst
5) toneburst, uncommitted, committed */
__u8 m_uncommitted_cmd; // state of the 4 uncommitted switches..
4) uncommitted, committed, toneburst
5) toneburst, uncommitted, committed */
__u8 m_uncommitted_cmd; // state of the 4 uncommitted switches..
+#endif
};
class eDVBSatelliteSwitchParameters
{
};
class eDVBSatelliteSwitchParameters
{
+#ifdef SWIG
+ eDVBSatelliteSwitchParameters();
+ ~eDVBSatelliteSwitchParameters();
+#endif
public:
enum t_22khz_signal { HILO=0, ON=1, OFF=2 }; // 22 Khz
enum t_voltage_mode { HV=0, _14V=1, _18V=2, _0V=3 }; // 14/18 V
public:
enum t_22khz_signal { HILO=0, ON=1, OFF=2 }; // 22 Khz
enum t_voltage_mode { HV=0, _14V=1, _18V=2, _0V=3 }; // 14/18 V
+#ifndef SWIG
t_voltage_mode m_voltage_mode;
t_22khz_signal m_22khz_signal;
__u8 m_rotorPosNum; // 0 is disable.. then use gotoxx
t_voltage_mode m_voltage_mode;
t_22khz_signal m_22khz_signal;
__u8 m_rotorPosNum; // 0 is disable.. then use gotoxx
+#endif
};
class eDVBSatelliteRotorParameters
{
};
class eDVBSatelliteRotorParameters
{
+#ifdef SWIG
+ eDVBSatelliteRotorParameters();
+ ~eDVBSatelliteRotorParameters();
+#endif
public:
enum { NORTH, SOUTH, EAST, WEST };
public:
enum { NORTH, SOUTH, EAST, WEST };
-
+#ifndef SWIG
eDVBSatelliteRotorParameters() { setDefaultOptions(); }
struct eDVBSatelliteRotorInputpowerParameters
eDVBSatelliteRotorParameters() { setDefaultOptions(); }
struct eDVBSatelliteRotorInputpowerParameters
@@
-165,8
+180,8
@@
public:
{
__u8 m_lo_direction; // EAST, WEST
__u8 m_la_direction; // NORT, SOUTH
{
__u8 m_lo_direction; // EAST, WEST
__u8 m_la_direction; // NORT, SOUTH
- double m_longitude; // longitude for gotoXX
°
function
- double m_latitude; // latitude for gotoXX
°
function
+ double m_longitude; // longitude for gotoXX
?
function
+ double m_latitude; // latitude for gotoXX
?
function
};
eDVBSatelliteRotorGotoxxParameters m_gotoxx_parameters;
};
eDVBSatelliteRotorGotoxxParameters m_gotoxx_parameters;
@@
-179,12
+194,18
@@
public:
m_gotoxx_parameters.m_longitude = 0.0;
m_gotoxx_parameters.m_latitude = 0.0;
}
m_gotoxx_parameters.m_longitude = 0.0;
m_gotoxx_parameters.m_latitude = 0.0;
}
+#endif
};
class eDVBSatelliteLNBParameters
{
};
class eDVBSatelliteLNBParameters
{
+#ifdef SWIG
+ eDVBSatelliteLNBParameters();
+ ~eDVBSatelliteLNBParameters();
+#endif
public:
enum t_12V_relais_state { OFF=0, ON };
public:
enum t_12V_relais_state { OFF=0, ON };
+#ifndef SWIG
t_12V_relais_state m_12V_relais_state; // 12V relais output on/off
__u8 tuner_mask; // useable by tuner ( 1 | 2 | 4...)
t_12V_relais_state m_12V_relais_state; // 12V relais output on/off
__u8 tuner_mask; // useable by tuner ( 1 | 2 | 4...)
@@
-198,8
+219,10
@@
public:
std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
eDVBSatelliteDiseqcParameters m_diseqc_parameters;
eDVBSatelliteRotorParameters m_rotor_parameters;
std::map<int, eDVBSatelliteSwitchParameters> m_satellites;
eDVBSatelliteDiseqcParameters m_diseqc_parameters;
eDVBSatelliteRotorParameters m_rotor_parameters;
-};
#endif
#endif
+};
+
+class eDVBRegisteredFrontend;
class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
{
class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
{
@@
-208,12
+231,20
@@
class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough
int m_lnbidx; // current index for set parameters
std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough
int m_lnbidx; // current index for set parameters
std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
+ eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends;
+ bool m_rotorMoving;
+#endif
+#ifdef SWIG
+ eDVBSatelliteEquipmentControl();
+ ~eDVBSatelliteEquipmentControl();
#endif
#endif
+ // helper function for setTunerLinked and setTunerDepends
+ RESULT setDependencyPointers( int no1, int no2, int dest_data_byte );
public:
#ifndef SWIG
public:
#ifndef SWIG
+ eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
DECLARE_REF(eDVBSatelliteEquipmentControl);
DECLARE_REF(eDVBSatelliteEquipmentControl);
- eDVBSatelliteEquipmentControl();
- RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat);
+ RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id);
int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
#endif
int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
#endif
@@
-247,6
+278,12
@@
public:
RESULT setVoltageMode(int mode);
RESULT setToneMode(int mode);
RESULT setRotorPosNum(int rotor_pos_num);
RESULT setVoltageMode(int mode);
RESULT setToneMode(int mode);
RESULT setRotorPosNum(int rotor_pos_num);
+/* Tuner Specific Parameters */
+ RESULT setTunerLinked(int from, int to);
+ RESULT setTunerDepends(int from, int to);
+
+ void setRotorMoving(bool); // called from the frontend's
+ bool isRotorMoving();
};
#endif
};
#endif