Skip to content

Commit

Permalink
VideoOutputOpenGL: Fix embedded playback when using OpenGL for main UI
Browse files Browse the repository at this point in the history
Now that OpenGL video will share the OpenGL context with the main UI,
setting the mask (in guidgrid.cpp) effectively hides the embedded video
- so clear the mask.
  • Loading branch information
Mark Kendall committed Jun 20, 2011
1 parent 5a5e70d commit 88023ee
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions mythtv/libs/libmythtv/videoout_opengl.cpp
Expand Up @@ -506,8 +506,13 @@ 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();
MythMainWindow *mwnd = GetMythMainWindow();
if (gl_context->IsShared() && mwnd && window.IsEmbedding())
{
if (mwnd->GetPaintWindow())
mwnd->GetPaintWindow()->setMask(QRegion());
mwnd->draw();
}

if (gl_videochain)
{
Expand Down

0 comments on commit 88023ee

Please sign in to comment.