Ticket #6162: mythtv.diff

tv_play.cpp

@@ -61 +61 @@
 #endif
 
 #define DEBUG_CHANNEL_PREFIX 0 /**< set to 1 to debug channel prefixing */
-#define DEBUG_ACTIONS        0 /**< set to 1 to debug actions           */
+#define DEBUG_ACTIONS        1 /**< set to 1 to debug actions           */
 
 #define LOC      QString("TV: ")
 #define LOC_WARN QString("TV Warning: ")
@@ -2116 +2116 @@
 void TV::timerEvent(QTimerEvent *te)
 {
     const int timer_id = te->timerId();
+    
+    VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(timerId=%1)").arg(timer_id));
 
     PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
     if (mctx->IsErrored())
     {
         ReturnPlayerLock(mctx);
         QThread::exit(1);
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(1)"));
         return;
     }
     ReturnPlayerLock(mctx);
@@ -2134 +2137 @@
              stateChangeTimerId.find(timer_id) == stateChangeTimerId.end());
     }
     if (ignore)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(2)"));
         return; // Always handle state changes first...
+    }
 
     bool handled = true;
     if (timer_id == lcdTimerId)
@@ -2165 +2171 @@
         handled = false;
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(3)"));
         return;
+    }
 
     // Check if it matches a stateChangeTimerId
     PlayerContext *ctx = NULL;
@@ -2203 +2212 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(4)"));
         return;
+    }
 
     // Check if it matches a recorderPlaybackInfoTimerId
     bool do_pbinfo_fetch = false;
@@ -2252 +2264 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(5)"));
         return;
+    }
 
     // Check if it matches a signalMonitorTimerId
     ctx = NULL;
@@ -2284 +2299 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(6)"));
         return;
+    }
 
     // Check if it matches a tvchainUpdateTimerId
     ctx = NULL;
@@ -2312 +2330 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(7)"));
         return;
+    }
 
     // Check if it matches keyListTimerId
     QKeyEvent *keyEvent = NULL;
@@ -2353 +2374 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(8)"));
         return;
+    }
 
     // Check if it matches networkControlTimerId
     QString netCmd = QString::null;
@@ -2380 +2404 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(9)"));
         return;
+    }
 
     // Check if it matches exitPlayerTimerId
     if (timer_id == exitPlayerTimerId)
@@ -2426 +2453 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(10)"));
         return;
+    }
 
     if (timer_id == jumpMenuTimerId)
     {
@@ -2439 +2469 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(11)"));
         return;
+    }
 
     if (timer_id == udpNotifyTimerId)
     {
@@ -2453 +2486 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(12)"));
         return;
+    }
 
     if (timer_id == switchToInputTimerId)
     {
@@ -2473 +2509 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(13)"));
         return;
+    }
 
     if (timer_id == ccInputTimerId)
     {
@@ -2493 +2532 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(14)"));
         return;
+    }
 
     if (timer_id == asInputTimerId)
     {
@@ -2513 +2555 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(15)"));
         return;
+    }
 
     if (timer_id == queueInputTimerId)
     {
@@ -2542 +2587 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(16)"));
         return;
+    }
 
     if (timer_id == browseTimerId)
     {
@@ -2553 +2601 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(17)"));
         return;
+    }
 
     // Check unmute..
     ctx = NULL;
@@ -2584 +2635 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(18)"));
         return;
+    }
 
     if (timer_id == updateOSDPosTimerId)
     {
@@ -2614 +2668 @@
     }
 
     if (handled)
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("timerEvent(19)"));
         return;
+    }
 
     if (timer_id == errorRecoveryTimerId)
     {
@@ -3019 +3076 @@
 
 bool TV::eventFilter(QObject *o, QEvent *e)
 {
+    VERBOSE(VB_IMPORTANT, LOC + QString("eventFilter( 0 )"));
+    
     const MythMainWindow *mainWindow = gContext->GetMainWindow();
     if (mainWindow == o)
     {
@@ -3031 +3090 @@
             mctx->UnlockDeleteNVP(__FILE__, __LINE__);
             ReturnPlayerLock(mctx);
         }
+        VERBOSE(VB_IMPORTANT, LOC + QString("eventFilter( 1 )"));
         return false;
     }
 
@@ -3045 +3105 @@
             if (!keyListTimerId)
                 keyListTimerId = StartTimer(1, __LINE__);
 
+            VERBOSE(VB_IMPORTANT, LOC + QString("eventFilter( 2 )"));
             return true;
         }
         case QEvent::Paint:
@@ -3059 +3120 @@
                 ctx->UnlockDeleteNVP(__FILE__, __LINE__);
             }
             ReturnPlayerLock(mctx);
+            VERBOSE(VB_IMPORTANT, LOC + QString("eventFilter( 3 )"));
             return true;
         }
         case MythEvent::MythEventMessage:
         {
             customEvent((QEvent *)e);
+            VERBOSE(VB_IMPORTANT, LOC + QString("eventFilter( 4 )"));
             return true;
         }
         default:
+        {
+            VERBOSE(VB_IMPORTANT, LOC + QString("eventFilter( 5 )"));
             return false;
+        }
     }
 }