MythMainWindow: Break out the actual UI drawing into a separate method.

If the rendering context is shared, MythMainWindow assumes the 'other'
owner will call the draw method as appropriate (though UI animation will
continue to run as before).

In VideoOutputOpenGL, if we are embedding and the context is shared,
render the main UI after the framebuffer has been cleared and before the
video.

mythtv/libs/libmythtv/videoout_opengl.cpp

@@ -423,6 +423,9 @@ void VideoOutputOpenGL::PrepareFrame(VideoFrame *buffer, FrameScanType t,
         gl_context->SetBackground(0, 0, 0, 255);
     gl_context->ClearFramebuffer();
 
+    if (gl_context->IsShared() && GetMythMainWindow() && window.IsEmbedding())
+        GetMythMainWindow()->draw();
+
     if (gl_videochain)
     {
         gl_videochain->SetVideoRect(vsz_enabled ? vsz_desired_display_rect :

mythtv/libs/libmythui/mythmainwindow.cpp

@@ -641,7 +641,7 @@ void MythMainWindow::animate(void)
         }
     }
 
-    if (redraw)
+    if (redraw && !(d->render && d->render->IsShared()))
         d->paintwin->update(d->repaintRegion);
 
     for (it = d->stackList.begin(); it != d->stackList.end(); ++it)
@@ -701,6 +701,17 @@ void MythMainWindow::drawScreen(void)
         }
     }
 
+    if (!(d->render && d->render->IsShared()))
+        draw();
+
+    d->repaintRegion = QRegion(QRect(0, 0, 0, 0));
+}
+
+void MythMainWindow::draw(void)
+{
+    if (!d->painter)
+        return;
+
     d->painter->Begin(d->paintwin);
 
     QVector<QRect> rects = d->repaintRegion.rects();
@@ -729,8 +740,6 @@ void MythMainWindow::drawScreen(void)
     }
 
     d->painter->End();
-
-    d->repaintRegion = QRegion(QRect(0, 0, 0, 0));
 }
 
 void MythMainWindow::closeEvent(QCloseEvent *e)

mythtv/libs/libmythui/mythmainwindow.h

@@ -121,6 +121,7 @@ class MUI_PUBLIC MythMainWindow : public QWidget
     uint PushDrawDisabled(void);
     uint PopDrawDisabled(void);
     void SetEffectsEnabled(bool enable);
+    void draw(void);
 
   public slots:
     void mouseTimeout();