Ceton bug fix for handling failed tunings

This patch fixes a bug in code that detects a failed tuning and
attempts to retune. Before it was possible for the code to "forget"
what channel was attempting to be tuned and thus it could fail to
retune properly.

Fixes #10526

Signed-off-by: David Engel <dengel@mythtv.org>

Author: ldkronos

mythtv/libs/libmythtv/cetonstreamhandler.cpp

@@ -502,14 +502,9 @@ bool CetonStreamHandler::TuneProgram(uint program)
     return result;
 }
 
-bool CetonStreamHandler::TuneVChannel(const QString &vchannel)
+bool CetonStreamHandler::PerformTuneVChannel(const QString &vchannel)
 {
-    if ((vchannel != "0") && (_last_vchannel != "0"))
-        ClearProgramNumber();
-
-    LOG(VB_RECORD, LOG_INFO, LOC + QString("TuneVChannel(%1)").arg(vchannel));
-
-    _last_vchannel = vchannel;
+    LOG(VB_RECORD, LOG_INFO, LOC + QString("PerformTuneVChannel(%1)").arg(vchannel));
 
     QUrl params;
     params.addQueryItem("instance_id", QString::number(_tuner));
@@ -523,16 +518,30 @@ bool CetonStreamHandler::TuneVChannel(const QString &vchannel)
     if (!result)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC +
-            QString("TuneVChannel() - HTTP status = %1 - response = %2")
+            QString("PerformTuneVChannel() - HTTP status = %1 - response = %2")
             .arg(status).arg(response));
     }
 
     return result;
 }
 
+
+bool CetonStreamHandler::TuneVChannel(const QString &vchannel)
+{
+    if ((vchannel != "0") && (_last_vchannel != "0"))
+        ClearProgramNumber();
+
+    LOG(VB_RECORD, LOG_INFO, LOC + QString("TuneVChannel(%1)").arg(vchannel));
+
+    _last_vchannel = vchannel;
+
+    return PerformTuneVChannel(vchannel);
+}
+
 void CetonStreamHandler::ClearProgramNumber(void)
 {
-    TuneVChannel("0");
+    LOG(VB_RECORD, LOG_INFO, LOC + QString("ClearProgramNumber()"));
+    PerformTuneVChannel("0");
     for(int i=0; i<50;  i++)
     {
         if (GetVar("mux", "ProgramNumber") == "0")

mythtv/libs/libmythtv/cetonstreamhandler.h

@@ -55,6 +55,7 @@ class CetonStreamHandler : public StreamHandler
     void RepeatTuning(void);
 
     bool TunerOff(void);
+    bool PerformTuneVChannel(const QString &vchannel);
     void ClearProgramNumber(void);
 
     QString GetVar(const QString &section, const QString &variable) const;