Ticket #518: mythdiseqcupdate-2.patch

File mythdiseqcupdate-2.patch, 1.8 KB (added by Dibblah, 19 years ago)

Sets havetuned to true even if nothing was changed

  • libs/libmythtv/dvbdiseqc.cpp

    old new  
    118118        }
    119119
    120120        prev_tuning.tone = tuning.tone;
    121         havetuned = true;
    122121    }
    123122
    124123    usleep(DISEQC_SHORT_WAIT);
    … …  
    132131        }
    133132
    134133        prev_tuning.voltage = tuning.voltage;
    135         havetuned = true;
    136134    }
    137135
     136    if ((prev_tuning.tone == tuning.tone) && (prev_tuning.voltage == tuning.voltage))
     137        havetuned = true;
     138
    138139    return true;
    139140}
    140141
    … …  
    155156        }
    156157
    157158        prev_tuning.diseqc_port = tuning.diseqc_port;
    158         havetuned = true;
    159159    }
    160160
     161    if (prev_tuning.diseqc_port == tuning.diseqc_port)
     162        havetuned = true;
     163
    161164    return true;
    162165}
    163166
    … …  
    391394
    392395    }
    393396
     397    if ((prev_tuning.diseqc_port == tuning.diseqc_port &&
     398        prev_tuning.tone == tuning.tone &&
     399        prev_tuning.voltage == tuning.voltage))
     400        havetuned = true;
     401
     402
    394403    return true;
    395404}
    396405
    … …  
    499508        prev_tuning.diseqc_port = tuning.diseqc_port;
    500509        prev_tuning.tone = tuning.tone;
    501510        prev_tuning.voltage = tuning.voltage;
    502         havetuned = true;
    503511    }
    504512
     513    if ((prev_tuning.diseqc_port == tuning.diseqc_port &&
     514         prev_tuning.tone == tuning.tone &&
     515         prev_tuning.voltage == tuning.voltage))
     516        havetuned = true;
     517
     518
    505519    return true;
    506520}
    507521
    … …  
    701715        prev_tuning.diseqc_pos = tuning.diseqc_pos;
    702716        prev_tuning.tone = tuning.tone;
    703717        prev_tuning.voltage = tuning.voltage;
    704         havetuned = true;
    705718    }
    706719
     720    if ((prev_tuning.diseqc_port == tuning.diseqc_port &&
     721          prev_tuning.tone == tuning.tone &&
     722          prev_tuning.diseqc_pos == tuning.diseqc_pos &&
     723          prev_tuning.voltage == tuning.voltage))
     724        havetuned = true;
     725
    707726    return true;
    708727}