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

MythTV · Mar 19, 2011 · 6ce20f6 · 6ce20f6
1 parent 8c7d781
commit 6ce20f6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/mythtv/libs/libmythtv/videoout_d3d.cpp b/mythtv/libs/libmythtv/videoout_d3d.cpp
@@ -369,7 +369,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();

diff --git a/mythtv/libs/libmythtv/videoout_opengl.cpp b/mythtv/libs/libmythtv/videoout_opengl.cpp
@@ -426,7 +426,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);

diff --git a/mythtv/libs/libmythtv/videoout_quartz.cpp b/mythtv/libs/libmythtv/videoout_quartz.cpp
@@ -1687,7 +1687,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 &&

diff --git a/mythtv/libs/libmythtv/videoout_vdpau.cpp b/mythtv/libs/libmythtv/videoout_vdpau.cpp
@@ -499,7 +499,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)