Ticket #4339: 4339-dbg-v1.patch

libs/libmythtv/tv_play.h

@@ -553 +553 @@
     // Channel changing timeout notification variables
     QTime   lockTimer;
     bool    lockTimerOn;
+    QDateTime lastLockSeenTime;
 
     // Previous channel functionality state variables
     str_vec_t prevChan;       ///< Previous channels

libs/libmythtv/tv_play.cpp

@@ -1466 +1466 @@
         activerecorder = recorder;
         recorder->Setup();
         
+        VERBOSE(VB_IMPORTANT, "HandleStateChange(none,livetv): "
+                "lockTimer turned off");
+        QDateTime timerOffTime = QDateTime::currentDateTime();
         lockTimerOn = false;
 
         SET_NEXT();
@@ -1516 +1519 @@
         }
         else
         {
-            lockTimer.start();
-            lockTimerOn = true;
+            if (!lastLockSeenTime.isValid() ||
+                (lastLockSeenTime < timerOffTime))
+            {
+                VERBOSE(VB_IMPORTANT, "HandleStateChange(none,livetv): "
+                        "lockTimer turned on");
+                lockTimer.start();
+                lockTimerOn = true;
+            }
+            else
+            {
+                VERBOSE(VB_IMPORTANT, "HandleStateChange(none,livetv): "
+                        "lockTimer NOT turned on, lock seen recently.");
+            }
         }
     }
     else if (TRANSITION(kState_WatchingLiveTV, kState_None))
@@ -2852 +2866 @@
                 }
                 else if (dialogname == "channel_timed_out")
                 {
+                    VERBOSE(VB_IMPORTANT, "channel_timed_out: "
+                            "lockTimer turned off");
                     lockTimerOn = false;
                 }
 
@@ -3176 +3192 @@
                 activerecorder->SetSignalMonitoringRate(rate,notify);
                 UnpauseLiveTV();
 
+                VERBOSE(VB_IMPORTANT, "SIGNALMON lockTimer turned off");
                 lockTimerOn = false;
                 sigMonMode  = !sigMonMode;
             }
@@ -3825 +3842 @@
     if (!pipnvp)
         return;
 
+    VERBOSE(VB_IMPORTANT, "ToggleActiveWindow:: lockTimer turned on");
     lockTimerOn = false;
     if (activenvp == nvp)
     {
@@ -3875 +3893 @@
         }
     }
 
+    VERBOSE(VB_IMPORTANT, "SwapPIP lockTimer turned off");
     lockTimerOn = false;
 
     struct pip_info main, pip;
@@ -4485 +4504 @@
 
         // now restart stuff
         lastSignalUIInfo.clear();
+        VERBOSE(VB_IMPORTANT, "SwitchCards lockTimer turned on");
         lockTimerOn = false;
 
         activerecorder = recorder = testrec;
@@ -4534 +4554 @@
             activenvp = nvp;
             activerbuffer = prbuffer;
             lockTimer.start();
+            VERBOSE(VB_IMPORTANT, "SwitchCards lockTimer turned on");
             lockTimerOn = true;
         }
     }
@@ -4593 +4614 @@
     {
         // Pause the backend recorder, send command, and then unpause..
         PauseLiveTV();
+        VERBOSE(VB_IMPORTANT, "ToggleInputs() lockTimer turned off");
         lockTimerOn = false;
         inputname = activerecorder->SetInput(inputname);
         UnpauseLiveTV();
@@ -5202 +5224 @@
         GetOSD()->SetSettingsText(displayName, 3);
 }
 
+static QString to_comma_list(const QStringList &list)
+{
+    QString ret = "";
+    for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it)
+        ret += *it + ",";
+
+    if (ret.length())
+        return ret.left(ret.length()-1);
+
+    return "";
+}
+
 /** \fn TV::UpdateOSDSignal(const QStringList&)
  *  \brief Updates Signal portion of OSD...
  */
-void TV::UpdateOSDSignal(const QStringList& strlist)
+void TV::UpdateOSDSignal(const QStringList &strlist)
 {
     QMutexLocker locker(&osdlock);
 
+    VERBOSE(VB_IMPORTANT, "UpdateOSDSignal("<<to_comma_list(strlist)
+            <<") begin -- lockTimerOn: "<<lockTimerOn);
+
     if (!GetOSD() || browsemode || !queuedChanNum.isEmpty())
     {
         if (&lastSignalMsg != &strlist)
+        {
+            VERBOSE(VB_IMPORTANT, "UpdateOSDSignal() end "
+                    "-- set lastSignalMsg");
             lastSignalMsg = strlist;
+        }
         return;
     }
 
@@ -5341 +5382 @@
 
     // Turn off lock timer if we have an "All Good" or good PMT
     if (allGood || (pmt == "M"))
+    {
         lockTimerOn = false;
+        lastLockSeenTime = QDateTime::currentDateTime();
+    }
+
+    VERBOSE(VB_IMPORTANT, "UpdateOSDSignal() end -- lockTimerOn: "
+            <<lockTimerOn<<" allGood: "<<allGood
+            <<QString(" pmt: %1").arg(pmt));
 }
 
 void TV::UpdateOSDTimeoutMessage(void)
 {
+    //VERBOSE(VB_IMPORTANT, "UpdateOSDTimeoutMessage() begin -- lockTimerOn: "
+    //        <<lockTimerOn<<")");
+
     QString dlg_name("channel_timed_out");
     bool timed_out = false;
     if (activerecorder)
@@ -5380 +5431 @@
     static QString chan_up   = GET_KEY("TV Playback", "CHANNELUP");
     static QString chan_down = GET_KEY("TV Playback", "CHANNELDOWN");
     static QString next_src  = GET_KEY("TV Playback", "NEXTSOURCE");
-    static QString tog_cards = GET_KEY("TV Playback", "NEXTCARD");
+    static QString tog_cards = GET_KEY("TV Playback", "NEXTINPUT");
 
     QString message = tr(
         "You should have gotten a channel lock by now. "
         "You can continue to wait for a signal, or you "
         "can change the channels with %1 or %2, change "
-        "video source (%3), change cards  (%4), etc.")
+        "video source (%3), inputs (%4), etc.")
         .arg(chan_up).arg(chan_down).arg(next_src).arg(tog_cards);
 
     QStringList options;
@@ -6266 +6317 @@
         }
         else if (message.left(6) == "SIGNAL")
         {
+            VERBOSE(VB_IMPORTANT, LOC + "Got: " + message);
             int cardnum = (QStringList::split(" ", message))[1].toInt();
             QStringList signalList = me->ExtraDataList();
             bool tc = activerecorder &&
                 (activerecorder->GetRecorderNumber() == cardnum);
             if (tc && signalList.size())
             {
+                VERBOSE(VB_IMPORTANT, LOC + "Processed: " + message);
                 UpdateOSDSignal(signalList);
             }
+            else
+            {
+                int ac_rec = -1;
+                if (activerecorder)
+                    ac_rec = activerecorder->GetRecorderNumber();
+                VERBOSE(VB_IMPORTANT, LOC + "Ignored: " + message
+                        <<"\n\t\t\tactiverec: "<<activerecorder
+                        <<" ac->rec: "<<ac_rec);
+            }
         }
         else if (recorder && message.left(7) == "SKIP_TO")
         {
@@ -8009 +8071 @@
 void TV::PauseLiveTV(void)
 {
     VERBOSE(VB_PLAYBACK, LOC + "PauseLiveTV()");
+
+    VERBOSE(VB_IMPORTANT, "PauseLiveTV() lockTimer turned off 1");
     lockTimerOn = false;
 
     if (activenvp && activerbuffer)
@@ -8027 +8091 @@
     lastSignalUIInfo.clear();
     osdlock.unlock();
 
+    VERBOSE(VB_IMPORTANT, "PauseLiveTV() lockTimer turned off 2");
     lockTimerOn = false;
 
     QString input = activerecorder->GetInput();
@@ -8035 +8100 @@
     {
         lockTimer.start();
         lockTimerOn = true;
+        VERBOSE(VB_IMPORTANT, "PauseLiveTV() lockTimer turned on");
     }
 }