Ticket #4328: hdhr.myth.v0.25pre-2256-g4d4eaa8.mythtv.patch

mythtv/libs/libmythtv/dtvchannel.cpp

@@ -279 +279 @@
     }
 
     bool ok = true;
-    if ((*it)->externalChanger.isEmpty())
+    if ((*it)->name.contains("composite", Qt::CaseInsensitive) ||
+        (*it)->name.contains("s-video", Qt::CaseInsensitive))
     {
-        if ((*it)->name.contains("composite", Qt::CaseInsensitive) ||
-            (*it)->name.contains("s-video", Qt::CaseInsensitive))
+        if ((*it)->externalChanger.isEmpty())
         {
             VERBOSE(VB_GENERAL, LOC_WARN + "You have not set "
                     "an external channel changing"
                     "\n\t\t\tscript for a composite or s-video "
                     "input. Channel changing will do nothing.");
         }
-        else if (isFrequency && Tune(frequency, ""))
+    }
+    else if (isFrequency && Tune(frequency, ""))
+    {
+    }
+    else if (isFrequency)
+    {
+        // Initialize basic the tuning parameters
+        DTVMultiplex tuning;
+        if (!mplexid || !tuning.FillFromDB(tunerType, mplexid))
         {
+            VERBOSE(VB_IMPORTANT, loc_err +
+                    "Failed to initialize multiplex options");
+            ok = false;
         }
-        else if (isFrequency)
+        else
         {
-            // Initialize basic the tuning parameters
-            DTVMultiplex tuning;
-            if (!mplexid || !tuning.FillFromDB(tunerType, mplexid))
-            {
-                VERBOSE(VB_IMPORTANT, loc_err +
-                        "Failed to initialize multiplex options");
-                ok = false;
-            }
-            else
-            {
-                // Try to fix any problems with the multiplex
-                CheckOptions(tuning);
+            // Try to fix any problems with the multiplex
+            CheckOptions(tuning);
 
-                // Tune to proper multiplex
-                if (!Tune(tuning, (*it)->name))
-                {
-                    VERBOSE(VB_IMPORTANT, loc_err + "Tuning to frequency.");
+            // Tune to proper multiplex
+            if (!Tune(tuning, (*it)->name))
+            {
+                VERBOSE(VB_IMPORTANT, loc_err + "Tuning to frequency.");
 
-                    ClearDTVInfo();
-                    ok = false;
-                }
+                ClearDTVInfo();
+                ok = false;
             }
         }
-        else
-        {
-            ok = Tune(freqid, finetune);
-        }
+    }
+    else
+    {
+        ok = Tune(freqid, finetune);
     }
 
     VERBOSE(VB_CHANNEL, loc + " " + ((ok) ? "success" : "failure"));

mythtv/libs/libmythtv/hdhrchannel.h

@@ -37 +37 @@
         { return _tuner_types; }
     virtual bool IsMaster(void) const
         { return _master == NULL; }
+    virtual bool IsExternalChannelChangeSupported(void) { return true; }
 
     // Sets
     virtual bool SetChannelByString(const QString &channum);

mythtv/libs/libmythtv/hdhrsignalmonitor.cpp

@@ -92 +92 @@
     if (!running || exit)
         return;
 
+    SignalMonitor::UpdateValues();
+
+    {
+        QMutexLocker locker(&statusLock);
+        if (!scriptStatus.IsGood())
+            return;
+    }
+
     if (streamHandlerStarted)
     {
         EmitStatus();