setRotorPosNum(1); // stored pos 1
}
-static void checkLinkedParams(int direction, long &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
+int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id, int *highest_score_lnb)
{
- eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
- if (linked_fe->m_inuse)
- {
- long ocsw = -1,
- oucsw = -1,
- oToneburst = -1;
- linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
- linked_fe->m_frontend->getData(eDVBFrontend::UCSW, oucsw);
- linked_fe->m_frontend->getData(eDVBFrontend::TONEBURST, oToneburst);
-#if 0
- eDebug("compare csw %02x == lcsw %02x",
- csw, ocsw);
- if ( diseqc )
- eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x",
- ucsw, oucsw, toneburst, oToneburst);
- if ( rotor )
- eDebug("compare pos %d == current pos %d",
- sat.orbital_position, oRotorPos);
-#endif
- if ( (csw != ocsw) ||
- ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
- ( rotor && RotorPos != sat.orbital_position ) )
- {
-// 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 :)");
- }
- linked_fe->m_frontend->getData(direction, (long&)linked_ptr);
-}
+ int score=0, satcount=0;
-int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id )
-{
- int ret=0, satcount=0;
+ if (highest_score_lnb)
+ *highest_score_lnb = -1;
for (int idx=0; idx <= m_lnbidx; ++idx )
{
eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
if ( lnb_param.slot_mask & slot_id ) // lnb for correct tuner?
{
+ int ret = 0;
eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
satcount += lnb_param.m_satellites.size();
toneburst = di_param.m_toneburst_param,
curRotorPos;
- fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
- fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr);
if ( sat.frequency > lnb_param.m_lof_threshold )
rotor = true;
ret=10000;
- if (rotor && curRotorPos != -1)
- ret -= abs(curRotorPos-sat.orbital_position);
}
else
{
ret = 15000;
}
- while (ret && linked_prev_ptr != -1) // check for linked tuners..
- checkLinkedParams(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor, curRotorPos);
+ if (m_not_linked_slot_mask & slot_id) // frontend with direct connection?
+ {
+ long ocsw = -1,
+ oucsw = -1,
+ oToneburst = -1;
+ fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+ fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
+ fe->getData(eDVBFrontend::CSW, ocsw);
+ fe->getData(eDVBFrontend::UCSW, oucsw);
+ fe->getData(eDVBFrontend::TONEBURST, oToneburst);
+ while (ret && linked_prev_ptr != -1) // check for linked tuners..
+ {
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+ if (linked_fe->m_inuse)
+ {
+ if ( (csw != ocsw) ||
+ ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+ ( rotor && curRotorPos != sat.orbital_position ) )
+ {
+ ret=0;
+ }
+ }
+ linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+ }
+ while (ret && linked_next_ptr != -1) // check for linked tuners..
+ {
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
+ if (linked_fe->m_inuse)
+ {
+ if ( (csw != ocsw) ||
+ ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+ ( rotor && curRotorPos != sat.orbital_position ) )
+ {
+ ret=0;
+ }
+ }
+ linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, (long&)linked_next_ptr);
+ }
+ }
+ else // linked frontend..
+ {
+ long ocsw = -1,
+ oucsw = -1,
+ oToneburst = -1;
+ while (linked_prev_ptr != -1)
+ {
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+ linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+ if (linked_prev_ptr == -1)
+ {
+ iDVBFrontend *sec_fe = linked_fe->m_frontend;
+ sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+ if (linked_fe->m_inuse)
+ {
+ sec_fe->getData(eDVBFrontend::CSW, ocsw);
+ sec_fe->getData(eDVBFrontend::UCSW, oucsw);
+ sec_fe->getData(eDVBFrontend::TONEBURST, oToneburst);
+ if ( (csw != ocsw) ||
+ ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+ ( rotor && curRotorPos != sat.orbital_position ) )
+ {
+ ret=0;
+ }
+ }
+ }
+ }
+ }
- while (ret && linked_next_ptr != -1) // check for linked tuners..
- checkLinkedParams(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor, curRotorPos);
+ if (ret && rotor && curRotorPos != -1)
+ ret -= abs(curRotorPos-sat.orbital_position);
if (ret)
if (satpos_depends_ptr != -1)
if ( satpos_depends_to_fe->m_inuse )
{
if (!rotor || curRotorPos != sat.orbital_position)
- {
-// eDebug("can not tune this transponder ... rotor on other tuner is positioned to %d", oRotorPos);
ret=0;
- }
}
-// else
-// eDebug("OK .. can tune this transponder satpos is correct :)");
}
if (ret)
int lof = sat.frequency > lnb_param.m_lof_threshold ?
lnb_param.m_lof_hi : lnb_param.m_lof_lo;
int tuner_freq = abs(sat.frequency - lof);
-// eDebug("tuner freq %d", tuner_freq);
if (tuner_freq < 900000 || tuner_freq > 2200000)
- {
ret=0;
-// eDebug("Transponder not tuneable with this lnb... %d Khz out of tuner range",
-// tuner_freq);
- }
+ }
+ if (ret > score)
+ {
+ score = ret;
+ if (highest_score_lnb)
+ *highest_score_lnb = idx;
}
}
}
}
- if (ret && satcount)
- ret -= (satcount-1);
- if (ret && m_not_linked_slot_mask & slot_id)
- ret += 5; // increase score for tuners with direct sat connection
- return ret;
+ if (score && satcount)
+ score -= (satcount-1);
+ if (score && m_not_linked_slot_mask & slot_id)
+ score += 5; // increase score for tuners with direct sat connection
+ return score;
}
bool need_turn_fast(int turn_speed)
{
int begin = turn_speed >> 16; // high word is start time
int end = turn_speed&0xFFFF; // low word is end time
- time_t now_time = eDVBLocalTimeHandler::getInstance()->nowTime();
+ time_t now_time = ::time(0);
tm nowTime;
localtime_r(&now_time, &nowTime);
int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1;
RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout)
{
- for (int idx=0; idx <= m_lnbidx; ++idx )
+ int lnb_idx = -1;
+ if (canTune(sat, &frontend, slot_id, &lnb_idx))
{
- eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
- if (!(lnb_param.slot_mask & slot_id)) // lnb for correct tuner?
- continue;
+ eDVBSatelliteLNBParameters &lnb_param = m_lnbs[lnb_idx];
eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters;
{
eDVBSatelliteSwitchParameters &sw_param = sit->second;
bool doSetFrontend = true;
- bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id;
+ bool doSetVoltageToneFrontend = true;
bool allowDiseqc1_2 = true;
+ bool sendDiSEqC = false;
long band=0,
voltage = iDVBFrontend::voltageOff,
tone = iDVBFrontend::toneOff,
lastRotorCmd = -1,
curRotorPos = -1,
satposDependPtr = -1;
+ iDVBFrontend *sec_fe=&frontend;
- frontend.getData(eDVBFrontend::CSW, lastcsw);
- frontend.getData(eDVBFrontend::UCSW, lastucsw);
- frontend.getData(eDVBFrontend::TONEBURST, lastToneburst);
- frontend.getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd);
- frontend.getData(eDVBFrontend::ROTOR_POS, curRotorPos);
frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr);
- if (satposDependPtr != -1 && !doSetVoltageToneFrontend)
+ if (!(m_not_linked_slot_mask & slot_id)) // frontend with direct connection?
{
- allowDiseqc1_2 = false;
- doSetVoltageToneFrontend = true;
+ long linked_prev_ptr;
+ frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+ while (linked_prev_ptr != -1)
+ {
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+ sec_fe = linked_fe->m_frontend;
+ sec_fe->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+ }
+ if (satposDependPtr != -1)
+ allowDiseqc1_2 = false;
}
+ sec_fe->getData(eDVBFrontend::CSW, lastcsw);
+ sec_fe->getData(eDVBFrontend::UCSW, lastucsw);
+ sec_fe->getData(eDVBFrontend::TONEBURST, lastToneburst);
+ sec_fe->getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd);
+ sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+
if ( sat.frequency > lnb_param.m_lof_threshold )
band |= 1;
eDebugNoNewLine("0");
eDebug("");
#endif
-
if (doSetVoltageToneFrontend)
{
int RotorCmd=-1;
sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
{
if ( send_mask & 4 )
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
}
}
+ sendDiSEqC = true;
}
eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
if ( rotor_param.m_inputpower_parameters.m_use )
{ // use measure rotor input power to detect rotor state
+ bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
eSecCommand::rotor cmd;
eSecCommand::pair compare;
compare.voltage = VOLTAGE(18);
compare.val = 0;
sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
////////////////////////////
- sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) ); // 2 retries
sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) ); // check if rotor has started
sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) ); // timeout .. we assume now the rotor is already at the correct position
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // goto loop start
- sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, +9 ) ); // timeout .. we assume now the rotor is already at the correct position
+ sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, turn_fast ? 10 : 9 ) ); // timeout .. we assume now the rotor is already at the correct position
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) ); // goto loop start
////////////////////
- if (need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed))
+ sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
+ if (turn_fast)
sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) ); // 2 minutes running timeout
// rotor running loop
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec
sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
cmd.direction=0; // check for stopped rotor
- cmd.steps=+4;
+ cmd.steps=+3;
sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
- sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); // timeout ? this should never happen
+ sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) ); // timeout ? this should never happen
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // running loop start
/////////////////////
sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
- sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
}
else
{ // use normal turning mode
sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) ); // wait 150msec after voltage change
- sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
compare.voltage = voltage;
sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) );
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -3) ); // goto loop start
sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
- sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );
}
- frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
- frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
+ sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+ sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
+ sendDiSEqC = true;
}
}
}
else
+ {
+ sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
csw = band;
+ }
+
+ if (sendDiSEqC)
+ sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
- frontend.setData(eDVBFrontend::CSW, csw);
- frontend.setData(eDVBFrontend::UCSW, ucsw);
- frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
+ sec_fe->setData(eDVBFrontend::NEW_CSW, csw);
+ sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
+ sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
if (doSetVoltageToneFrontend)
{
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
}
+ sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
+
if (doSetFrontend)
{
sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
}
+
+ if (sendDiSEqC)
+ sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+
frontend.setSecSequence(sec_sequence);
return 0;
}
}
-
- eDebug("found no useable satellite configuration for orbital position (%d)", sat.orbital_position );
+ eDebug("found no useable satellite configuration for %s freq %d%s %s on orbital position (%d)",
+ sat.system ? "DVB-S2" : "DVB-S",
+ sat.frequency,
+ sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal ? "H" :
+ eDVBFrontendParametersSatellite::Polarisation::Vertical ? "V" :
+ eDVBFrontendParametersSatellite::Polarisation::CircularLeft ? "CL" : "CR",
+ sat.modulation == eDVBFrontendParametersSatellite::Modulation::Auto ? "AUTO" :
+ eDVBFrontendParametersSatellite::Modulation::QPSK ? "QPSK" :
+ eDVBFrontendParametersSatellite::Modulation::M8PSK ? "8PSK" : "QAM16",
+ sat.orbital_position );
return -1;
}
eDebug("no more LNB free... cnt is %d", m_lnbidx);
return -ENOSPC;
}
- eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx-1);
+ eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
return 0;
}
}
};
-PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
-{
- ePyObject ret;
-
- if (tu1 != tu2)
- {
- eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
- {
- if (cnt == tu1)
- p1 = *it;
- else if (cnt == tu2)
- p2 = *it;
- }
-
- if (p1 && p2)
- {
- // check for linked tuners
-
- do
- {
- long tmp;
- p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
- if (tmp != -1)
- p1 = (eDVBRegisteredFrontend*)tmp;
- else
- break;
- }
- while (true);
-
- do
- {
- long tmp;
- p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
- if (tmp != -1)
- p2 = (eDVBRegisteredFrontend*)tmp;
- else
- break;
- }
- while (true);
-
- if (p1 != p2)
- {
- long tmp1=-1;
- long tmp2=-1;
- // check for rotor dependency
- p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
- if (tmp1 != -1)
- p1 = (eDVBRegisteredFrontend*)tmp1;
- p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2);
- if (tmp2 != -1)
- p2 = (eDVBRegisteredFrontend*)tmp2;
- if (p1 != p2)
- {
- int tu1_mask = 1 << p1->m_frontend->getSlotID(),
- tu2_mask = 1 << p2->m_frontend->getSlotID();
- std::set<sat_compare> tu1sats, tu2sats;
- std::list<sat_compare> tu1difference, tu2difference;
- std::insert_iterator<std::list<sat_compare> > insert1(tu1difference, tu1difference.begin()),
- insert2(tu2difference, tu2difference.begin());
- for (int idx=0; idx <= m_lnbidx; ++idx )
- {
- eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
- for (std::map<int, eDVBSatelliteSwitchParameters>::iterator sit(lnb_param.m_satellites.begin());
- sit != lnb_param.m_satellites.end(); ++sit)
- {
- if ( lnb_param.slot_mask & tu1_mask )
- tu1sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
- if ( lnb_param.slot_mask & tu2_mask )
- tu2sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
- }
- }
- std::set_difference(tu1sats.begin(), tu1sats.end(),
- tu2sats.begin(), tu2sats.end(),
- insert1);
- std::set_difference(tu2sats.begin(), tu2sats.end(),
- tu1sats.begin(), tu1sats.end(),
- insert2);
- if (!tu1sats.empty() || !tu2sats.empty())
- {
- int idx=0;
- ret = PyList_New(2+tu1difference.size()+tu2difference.size());
-
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu1difference.size()));
- for(std::list<sat_compare>::iterator it(tu1difference.begin()); it != tu1difference.end(); ++it)
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
-
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu2difference.size()));
- for(std::list<sat_compare>::iterator it(tu2difference.begin()); it != tu2difference.end(); ++it)
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
- }
- }
- }
- }
- }
- if (!ret)
- {
- ret = PyList_New(2);
- PyList_SET_ITEM(ret, 0, PyInt_FromLong(0));
- PyList_SET_ITEM(ret, 1, PyInt_FromLong(0));
- }
- return ret;
-}
-
RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
{
eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
{
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
- if (cnt == tu1)
+ if (it->m_frontend->getSlotID() == tu1)
p1 = *it;
- else if (cnt == tu2)
+ else if (it->m_frontend->getSlotID() == tu2)
p2 = *it;
}
if (p1 && p2)
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
- if (cnt == tu1)
+ if (it->m_frontend->getSlotID() == tu1)
p1 = *it;
- else if (cnt == tu2)
+ else if (it->m_frontend->getSlotID() == tu2)
p2 = *it;
}
if (p1 && p2)
git.cweiske.de / enigma2.git / blobdiff