Ticket #8641: 8641-v4.patch

libs/libmythtv/tv_play.h

@@ -813 +813 @@
 
     // Window info (GUI is optional, transcoding, preview img, etc)
     TvPlayWindow *myWindow;   ///< Our screen, if it exists
-    ///< player bounds, for after DoEditSchedule() returns to normal playing.
+    /// player bounds, for after DoEditSchedule() returns to normal playing.
     QRect player_bounds;
-    ///< Prior GUI window bounds, for DoEditSchedule() and player exit().
+    /// Prior GUI window bounds, for DoEditSchedule() and player exit().
     QRect saved_gui_bounds;
     /// true if this instance disabled MythUI drawing.
     bool  weDisabledGUI;

libs/libmythtv/tv_play.cpp

@@ -1154 +1154 @@
         }
 
         MythMainWindow *mainWindow = GetMythMainWindow();
-        //QPalette p = mainWindow->palette();
-        //p.setColor(mainWindow->backgroundRole(), Qt::black);
-        //mainWindow->setPalette(p);
         mainWindow->installEventFilter(this);
+        // get this screen to show on screen immediately..
         qApp->processEvents();
     }
 
     {
+        VERBOSE(VB_PLAYBACK, LOC + "Init -- waiting on InitFromDB");
         QMutexLocker locker(&initFromDBLock);
         while (!initFromDBDone)
         {
@@ -1170 +1169 @@
         }
     }
 
+    VERBOSE(VB_PLAYBACK, LOC + "Init -- starting main loop");
+
     mainLoopCondLock.lock();
     start();
     mainLoopCond.wait(&mainLoopCondLock);
@@ -1196 +1197 @@
     gCoreContext->removeListener(this);
 
     if (GetMythMainWindow() && weDisabledGUI)
-        GetMythMainWindow()->PopDrawDisabled();
+        GetMythMainWindow()->PopDrawDisabled(__FILE__, __LINE__);
 
     if (myWindow)
     {
@@ -1986 +1987 @@
         if (GetMythMainWindow() && !weDisabledGUI)
         {
             weDisabledGUI = true;
-            GetMythMainWindow()->PushDrawDisabled();
+            GetMythMainWindow()->PushDrawDisabled(__FILE__, __LINE__);
             DrawUnusedRects();
         }
 
@@ -2059 +2060 @@
             if (GetMythMainWindow() && !weDisabledGUI)
             {
                 weDisabledGUI = true;
-                GetMythMainWindow()->PushDrawDisabled();
+                GetMythMainWindow()->PushDrawDisabled(__FILE__, __LINE__);
                 DrawUnusedRects();
             }
 
@@ -7801 +7802 @@
     // else has disabled painting show the MythUI window again.
     if (GetMythMainWindow() && weDisabledGUI)
     {
-        GetMythMainWindow()->PopDrawDisabled();
+        GetMythMainWindow()->PopDrawDisabled(__FILE__, __LINE__);
         weDisabledGUI = false;
     }
+
     GetMythMainWindow()->GetPaintWindow()->show();
 }
 
@@ -8482 +8484 @@
     if (message.left(11) == "EPG_EXITING" ||
         message.left(18) == "PROGFINDER_EXITING" ||
         message.left(21) == "VIEWSCHEDULED_EXITING" ||
-        message.left(19)   == "PLAYBACKBOX_EXITING" ||
+        message.left(19) == "PLAYBACKBOX_EXITING" ||
         message.left(22) == "SCHEDULEEDITOR_EXITING")
     {
         // Resize the window back to the MythTV Player size
@@ -8517 +8519 @@
         if (!weDisabledGUI)
         {
             weDisabledGUI = true;
-            GetMythMainWindow()->PushDrawDisabled();
+            GetMythMainWindow()->PushDrawDisabled(__FILE__, __LINE__);
             DrawUnusedRects();
         }
 

libs/libmythtv/videooutbase.cpp

@@ -1546 +1546 @@
 
 void VideoOutput::ExposeEvent(void)
 {
+    VERBOSE(VB_IMPORTANT, "VideoOutput::ExposeEvent()");
     windows[0].SetNeedRepaint(true);
 }
 

libs/libmythui/mythmainwindow.cpp

@@ -1176 +1176 @@
 }
 /* FIXME: end compatibility */
 
-uint MythMainWindow::PushDrawDisabled(void)
+uint MythMainWindow::PushDrawDisabled(const char *file, int line)
 {
     QMutexLocker locker(&d->m_drawDisableLock);
+    VERBOSE(VB_IMPORTANT, QString("PushDrawDisabled(%1@%2) -- begin")
+            .arg(file).arg(line));
     d->m_drawDisabledDepth++;
     if (d->m_drawDisabledDepth && d->m_drawEnabled)
         SetDrawEnabled(false);
+    VERBOSE(VB_IMPORTANT, QString("PushDrawDisabled(%1@%2) -- end")
+            .arg(file).arg(line));
     return d->m_drawDisabledDepth;
 }
 
-uint MythMainWindow::PopDrawDisabled(void)
+uint MythMainWindow::PopDrawDisabled(const char *file, int line)
 {
     QMutexLocker locker(&d->m_drawDisableLock);
+    VERBOSE(VB_IMPORTANT, QString("PopDrawDisabled(%1@%2) -- begin")
+            .arg(file).arg(line));
     if (d->m_drawDisabledDepth)
     {
         d->m_drawDisabledDepth--;
         if (!d->m_drawDisabledDepth && !d->m_drawEnabled)
             SetDrawEnabled(true);
     }
+    VERBOSE(VB_IMPORTANT, QString("PopDrawDisabled(%1@%2) -- end")
+            .arg(file).arg(line));
     return d->m_drawDisabledDepth;
 }
 
@@ -1203 +1211 @@
 
     if (!gCoreContext->IsUIThread())
     {
+        VERBOSE(VB_IMPORTANT, LOC + QString("SetDrawEnabled(%1) -- outside UI")
+                .arg(enable));
+
         QCoreApplication::postEvent(
             this, new MythEvent(
                 (enable) ?
                 MythEvent::kEnableDrawingEventType :
                 MythEvent::kDisableDrawingEventType));
 
+        VERBOSE(VB_IMPORTANT, LOC + QString("SetDrawEnabled(%1) -- waiting")
+                .arg(enable));
+
         while (QCoreApplication::hasPendingEvents())
             d->m_setDrawEnabledWait.wait(&d->m_setDrawEnabledLock);
 
+        VERBOSE(VB_IMPORTANT, LOC + QString("SetDrawEnabled(%1) -- done")
+                .arg(enable));
+
         return;
     }
 
+    static uint ecnt = 0, dcnt = 0;
+    ecnt += enable ? 1 : 0;
+    dcnt += enable ? 0 : 1;
+
+    VERBOSE(VB_IMPORTANT, LOC + QString("SetDrawEnabled(%1) cnt %2")
+            .arg(enable).arg(enable?ecnt:dcnt));
+
     setUpdatesEnabled(enable);
     d->m_drawEnabled = enable;
 
@@ -2029 +2053 @@
     }
     else if (ce->type() == MythEvent::kPushDisableDrawingEventType)
     {
-        PushDrawDisabled();
+        PushDrawDisabled(__FILE__, __LINE__);
     }
     else if (ce->type() == MythEvent::kPopDisableDrawingEventType)
     {
-        PopDrawDisabled();
+        PopDrawDisabled(__FILE__, __LINE__);
     }
     else if (ce->type() == MythEvent::kDisableDrawingEventType)
     {

libs/libmythui/mythmainwindow.h

@@ -113 +113 @@
 
     QWidget *currentWidget(void);
 
-    uint PushDrawDisabled(void);
-    uint PopDrawDisabled(void);
+    uint PushDrawDisabled(const char *file, int line);
+    uint PopDrawDisabled(const char *file, int line);
     void SetEffectsEnabled(bool enable);
 
   public slots: