Ticket #4471: t4473_v3.diff

libs/libmythtv/dvbchannel.h

@@ -131 +131 @@
     /// Last tuning options Tune() succesfully sent to hardware
     DTVMultiplex      prev_tuning;
 
+    uint              last_lnb_dev_id;
+
     uint              tuning_delay;///< Extra delay to add for broken drivers
     uint              sigmon_delay;///< Minimum delay between FE_LOCK checks
     bool              first_tune;  ///< Used to force hardware reset

libs/libmythtv/dvbchannel.cpp

@@ -73 +73 @@
       frontend_name(QString::null), card_type(DTVTunerType::kTunerTypeUnknown),
       // Tuning
       tune_lock(false),             hw_lock(false),
+      last_lnb_dev_id(-1),
       tuning_delay(0),              sigmon_delay(25),
       first_tune(true),
       // Misc
@@ -706 +707 @@
     // send DVB-S setup
     if (is_dvbs)
     {
-        // make sure we tune to frequency, no matter what happens..
-        // causes glitches after multirec merge
-        //reset = first_tune = true;
-
         // configure for new input
         if (!same_input)
             diseqc_settings.Load(inputid);
-            
+
         // execute diseqc commands
         if (!diseqc_tree->Execute(diseqc_settings, tuning))
         {
@@ -730 +727 @@
                     "No LNB for this configuration");
             return false;
         }
+
+        if (lnb->GetDeviceID() != last_lnb_dev_id)
+        {
+            last_lnb_dev_id = lnb->GetDeviceID();
+            // make sure we tune to frequency, if the lnb has changed
+            reset = first_tune = true;
+        }
+        
         params.frequency = lnb->GetIntermediateFrequency(
             diseqc_settings, tuning);