Skip to content

Commit

Permalink
VideoOutputOpenGL: Fix GUI display when embedding
Browse files Browse the repository at this point in the history
- inadvertantly removed
- reinstated with optimisations - we shouldn't need to force a repaint
every frame now that we use OpenGL throughout (which forces a repaint
anyway!)
  • Loading branch information
mark-kendall committed Mar 6, 2019
1 parent d545b67 commit ecd926f
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions mythtv/libs/libmythtv/videoout_opengl.cpp
Expand Up @@ -528,6 +528,26 @@ void VideoOutputOpenGL::PrepareFrame(VideoFrame *Frame, FrameScanType Scan, OSD
second = first.translated(0, main.height() / 2);
}

// main UI when embedded
if (window.IsEmbedding())
{
MythMainWindow *window = GetMythMainWindow();
if (window && window->GetPaintWindow())
{
if (twopass)
m_render->SetViewPort(first, true);
window->GetPaintWindow()->clearMask();
window->draw(m_openGLPainter);
if (twopass)
{
m_render->SetViewPort(second, true);
window->GetPaintWindow()->clearMask();
window->draw(m_openGLPainter);
m_render->SetViewPort(main, true);
}
}
}

// video
if (m_openGLVideo && !dummy)
{
Expand Down

0 comments on commit ecd926f

Please sign in to comment.