Permalink
Browse files

Video playback: Don't try and display the OSD when embedded.

(cherry picked from commit 6ce20f6)
  • Loading branch information...
1 parent 1f532a5 commit ee6aaa7a650b71faba5a9b4f6623e0faf556bd33 Mark Kendall committed Mar 19, 2011
@@ -297,7 +297,7 @@ void VideoOutputD3D::PrepareFrame(VideoFrame *buffer, FrameScanType t,
(*it)->Draw();
}
}
- if (osd && m_osd_painter)
+ if (osd && m_osd_painter && !window.IsEmbedding())
osd->DrawDirect(m_osd_painter, GetTotalOSDBounds().size(),
true);
m_render->End();
@@ -393,7 +393,7 @@ void VideoOutputOpenGL::PrepareFrame(VideoFrame *buffer, FrameScanType t,
}
}
- if (osd && gl_painter)
+ if (osd && gl_painter && !window.IsEmbedding())
osd->DrawDirect(gl_painter, GetTotalOSDBounds().size(), true);
gl_context->Flush(false);
@@ -1689,7 +1689,8 @@ void VideoOutputQuartz::ProcessFrame(VideoFrame *frame, OSD *osd,
}
ShowPIPs(frame, pipPlayers);
- DisplayOSD(frame, osd);
+ if (osd && !window.IsEmbedding())
+ DisplayOSD(frame, osd);
if (m_deinterlacing &&
m_deintFilter != NULL &&
@@ -504,7 +504,7 @@ void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame, FrameScanType scan,
m_pip_ready ? m_pip_layer : 0, 0))
VERBOSE(VB_PLAYBACK, LOC_ERR + QString("Prepare frame failed."));
- if (osd && m_osd_painter)
+ if (osd && m_osd_painter && !window.IsEmbedding())
osd->DrawDirect(m_osd_painter, GetTotalOSDBounds().size(), true);
if (!frame)

0 comments on commit ee6aaa7

Please sign in to comment.