Ticket #5882: channel_mux_patch2.diff

File channel_mux_patch2.diff, 1.3 KB (added by mnix <mythtv-acct@…>, 11 years ago)

fix for missing sistandard in tuning parameters causing invalid multiplex entries - updated as previous fix was incomplete

  • libmythtv/frequencytables.cpp

     
    6060
    6161    tuning.Clear();
    6262
     63    tuning.sistandard = _tuning.sistandard;
     64
    6365    tuning.ParseTuningParams(
    6466        _tuner_type,
    6567        QString::number(_tuning.frequency),  _tuning.inversion.toString(),
  • channelutil.cpp

    old new  
    7777        "WHERE sourceid     = :SOURCEID   "
    7878        "  AND sistandard   = :SISTANDARD ";
    7979
    80     if (sistandard.toLower() != "dvb")
     80    if (sistandard.toLower().left(3) != "dvb")
    8181        qstr += "AND frequency    = :FREQUENCY   ";
    8282    else
    8383    {
     
    9191    query.bindValue(":SOURCEID",          db_source_id);
    9292    query.bindValue(":SISTANDARD",        sistandard);
    9393
    94     if (sistandard.toLower() != "dvb")
     94    if (sistandard.toLower().left(3) != "dvb")
    9595        query.bindValue(":FREQUENCY",     frequency);
    9696    else
    9797    {
     
    143143        // DVB specific
    144144        transport_id,  network_id);
    145145
    146     bool isDVB = (sistandard.toLower() == "dvb");
     146    bool isDVB = (sistandard.toLower().left(3) == "dvb");
    147147
    148148    QString updateStr =
    149149        "UPDATE dtv_multiplex "