#define BANDWIDTH_AUTO (BandWidth)3
#define GUARD_INTERVAL_AUTO (GuardInterval)4
#define HIERARCHY_AUTO (Hierarchy)4
-#define parm_frequency parm_Frequency
-#define parm_inversion parm_Inversion
+#define parm_frequency parm.Frequency
+#define parm_inversion parm.Inversion
#define parm_u_qpsk_symbol_rate parm.u.qpsk.SymbolRate
#define parm_u_qpsk_fec_inner parm.u.qpsk.FEC_inner
#define parm_u_qam_symbol_rate parm.u.qam.SymbolRate
#include <dvbsi++/cable_delivery_system_descriptor.h>
#include <dvbsi++/terrestrial_delivery_system_descriptor.h>
+void eDVBDiseqcCommand::setCommandString(const char *str)
+{
+ if (!str)
+ return;
+ len = strlen(str);
+ if (len > MAX_DISEQC_LENGTH)
+ len = MAX_DISEQC_LENGTH;
+ memcpy(data, str, len);
+}
+
void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
{
frequency = descriptor.getFrequency() * 10;
return 0;
}
-RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune)
{
sat = p;
+ sat.no_rotor_command_on_tune = no_rotor_command_on_tune;
m_type = iDVBFrontend::feSatellite;
return 0;
}
m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
CONNECT(m_sn->activated, eDVBFrontend::feEvent);
- m_sn->start();
return 0;
}
case FEC_7_8:
tmp = "FEC_7_8";
break;
-#ifdef HAVE_DVB_API_VERSION >= 3
+#if HAVE_DVB_API_VERSION >= 3
case FEC_8_9:
tmp = "FEC_8_9";
break;
void eDVBFrontend::setFrontend()
{
eDebug("setting frontend %d", m_fe);
+ m_sn->start();
+ feEvent(-1);
if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
{
perror("FE_SET_FRONTEND failed");
parm_u_qpsk_fec_inner = FEC_7_8;
break;
}
+ // FIXME !!! get frequency range from tuner
+ if ( parm_frequency < 900000 || parm_frequency > 2200000 )
+ {
+ eDebug("%d mhz out of tuner range.. dont tune", parm_frequency/1000);
+ return -EINVAL;
+ }
eDebug("tuning to %d mhz", parm_frequency/1000);
}
return res;
case eDVBFrontendParametersCable::FEC::f7_8:
parm_u_qam_fec_inner = FEC_7_8;
break;
-#ifdef HAVE_DVB_API_VERSION >= 3
+#if HAVE_DVB_API_VERSION >= 3
case eDVBFrontendParametersCable::FEC::f8_9:
parm_u_qam_fec_inner = FEC_8_9;
break;
{
eDebug("(%d)tune", m_fe);
+ m_timeout->stop();
+
int res=0;
if (m_type == -1)
return -ENODEV;
- feEvent(-1);
-
+ m_sn->stop();
m_sec_sequence.clear();
switch (m_type)
return -EINVAL;
res=prepare_cable(feparm);
if (!res)
+ {
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
case feTerrestrial:
}
res=prepare_terrestrial(feparm);
if (!res)
+ {
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
}
if (!res) // prepare ok
{
m_tuneTimer->start(0,true);
- m_timeout->stop();
m_sec_sequence.current() = m_sec_sequence.begin();
if (m_state != stateTuning)