Ticket #4471: t4473_v3.diff

File t4473_v3.diff, 2.0 KB (added by Janne Grunau, 11 years ago)
  • libs/libmythtv/dvbchannel.h

     
    131131    /// Last tuning options Tune() succesfully sent to hardware
    132132    DTVMultiplex      prev_tuning;
    133133
     134    uint              last_lnb_dev_id;
     135
    134136    uint              tuning_delay;///< Extra delay to add for broken drivers
    135137    uint              sigmon_delay;///< Minimum delay between FE_LOCK checks
    136138    bool              first_tune;  ///< Used to force hardware reset
  • libs/libmythtv/dvbchannel.cpp

     
    7373      frontend_name(QString::null), card_type(DTVTunerType::kTunerTypeUnknown),
    7474      // Tuning
    7575      tune_lock(false),             hw_lock(false),
     76      last_lnb_dev_id(-1),
    7677      tuning_delay(0),              sigmon_delay(25),
    7778      first_tune(true),
    7879      // Misc
     
    706707    // send DVB-S setup
    707708    if (is_dvbs)
    708709    {
    709         // make sure we tune to frequency, no matter what happens..
    710         // causes glitches after multirec merge
    711         //reset = first_tune = true;
    712 
    713710        // configure for new input
    714711        if (!same_input)
    715712            diseqc_settings.Load(inputid);
    716            
     713
    717714        // execute diseqc commands
    718715        if (!diseqc_tree->Execute(diseqc_settings, tuning))
    719716        {
     
    730727                    "No LNB for this configuration");
    731728            return false;
    732729        }
     730
     731        if (lnb->GetDeviceID() != last_lnb_dev_id)
     732        {
     733            last_lnb_dev_id = lnb->GetDeviceID();
     734            // make sure we tune to frequency, if the lnb has changed
     735            reset = first_tune = true;
     736        }
     737       
    733738        params.frequency = lnb->GetIntermediateFrequency(
    734739            diseqc_settings, tuning);
    735740