Ticket #2099: remove-norecover-retunes.patch

libs/libmythtv/dvbchannel.cpp

@@ -601 +601 @@
         return false;
     }
 
-    tune_time.start();
     desired_tuning = tuning;
 
     if (fd_frontend < 0)
@@ -784 +783 @@
     return NULL;
 }
 
-bool DVBChannel::IsSelfRetuning(void) const
-{
-    return info.caps & FE_CAN_RECOVER;
-}
-
-int DVBChannel::GetTimeSinceTune(void) const
-{
-    return first_tune ? 0 : tune_time.elapsed();
-}
-
 /** \fn drain_dvb_events(int)
  *  \brief Reads all the events off the queue, so we can use select
  *         in wait_for_backend(int,int).

libs/libmythtv/dvbchannel.h

@@ -59 +59 @@
     /// Returns true iff we have a faulty DVB driver that munges PMT
     bool HasCRCBug(void)                const { return has_crc_bug; }
     uint GetMinSignalMonitorDelay(void) const { return sigmon_delay; }
-    /// If true the hardware will retune when it loses lock, otherwise
-    /// the tuner needs to be told to tune when it loses lock.
-    bool IsSelfRetuning(void) const;
-    /// Milliseconds since last tuning request, or 0 if never tuned.
-    int  GetTimeSinceTune(void) const;
     /// Returns rotor object if it exists, NULL otherwise.
     const DiSEqCDevRotor *GetRotor(void) const;
 
@@ -121 +116 @@
     int               cardnum;     ///< DVB Card number
     bool              has_crc_bug; ///< true iff our driver munges PMT
     int               nextInputID; ///< Signal an input change
-    QTime             tune_time;   ///< FIXME won't work well at midnight
 };
 
 #endif

libs/libmythtv/dvbsignalmonitor.cpp

@@ -503 +503 @@
 void DVBSignalMonitor::RetuneMonitor(void)
 {
     DVBChannel *dvbchan = dynamic_cast<DVBChannel*>(channel);
-    int fd_frontend = dvbchan->GetFd();
 
-    // Get lock status
-    bool is_locked = true;
-    fe_status_t status;
-    if (ioctl(fd_frontend, FE_READ_STATUS, &status) != -1)
-    {
-        QMutexLocker locker(&statusLock);
-        is_locked = (status & FE_HAS_LOCK);
-        signalLock.SetValue(is_locked ? 1 : 0);
-    }
-
     // Rotor position
     if (HasFlags(kDVBSigMon_WaitForPos))
     {
@@ -547 +536 @@
             rotorPosition.SetValue(100);
         }
     }
-
-    // Periodically retune if card can't recover
-    if (!dvbchan->IsSelfRetuning() && !is_locked &&
-        dvbchan->GetTimeSinceTune() > RETUNE_TIMEOUT)
-    {
-        DBG_SM("UpdateValues", "Retuning for lock loss");
-        dvbchan->Retune();
-    }
 }
 
 void DVBSignalMonitor::RunTableMonitor(void)