diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-25 23:31:54 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-25 23:31:54 +0100 |
| commit | 4ebfa152f7e0e144bd25154263e62d55fa24d21b (patch) | |
| tree | 0c1217104f25ad4188563e77d2cf43cbe8f499b1 | |
| parent | e1072f2a25d38e636110e8df73042e0c801f3cd5 (diff) | |
| parent | 5b92b9a16fd70ffebb2822bdc3971d40e572901f (diff) | |
| download | enigma2-4ebfa152f7e0e144bd25154263e62d55fa24d21b.tar.gz enigma2-4ebfa152f7e0e144bd25154263e62d55fa24d21b.zip | |
Merge branch 'bug_623_fix_advanced_diseqc_1.0' into experimental
| -rw-r--r-- | lib/dvb/sec.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index d48d44e1..a8d2d924 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -551,6 +551,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if ( send_mask ) { + int diseqc_repeats = diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0 ? di_param.m_repeats : 0; int vlt = iDVBFrontend::voltageOff; eSecCommand::pair compare; compare.steps = +3; @@ -623,7 +624,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if ( send_mask & 2 ) ++loops; - loops <<= di_param.m_repeats; + loops <<= diseqc_repeats; for ( int i = 0; i < loops;) // fill commands... { @@ -660,7 +661,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS]; if (cmd) { - int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp; // standard says 100msek between two repeated commands + int delay = diseqc_repeats ? (tmp - 54) / 2 : tmp; // standard says 100msek between two repeated commands sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay) ); diseqc.data[2]=cmd; diseqc.data[3]=(cmd==0x38) ? csw : ucsw; |