summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-03-19 03:44:20 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-03-19 03:52:49 (GMT)
commitee6aaa7a650b71faba5a9b4f6623e0faf556bd33 (patch)
treece36d8800dff8306754b5d8684923e145b648861
parent1f532a5cfbb9194000756b1248ee3d1af7487539 (diff)
Video playback: Don't try and display the OSD when embedded.
(cherry picked from commit 6ce20f63502997afe7bffa82ccc47825fcc6f143)
-rw-r--r--mythtv/libs/libmythtv/videoout_d3d.cpp2
-rw-r--r--mythtv/libs/libmythtv/videoout_opengl.cpp2
-rw-r--r--mythtv/libs/libmythtv/videoout_quartz.cpp3
-rw-r--r--mythtv/libs/libmythtv/videoout_vdpau.cpp2
4 files changed, 5 insertions, 4 deletions
diff --git a/mythtv/libs/libmythtv/videoout_d3d.cpp b/mythtv/libs/libmythtv/videoout_d3d.cpp
index 5e88a9a..ff5cb32 100644
--- a/mythtv/libs/libmythtv/videoout_d3d.cpp
+++ b/mythtv/libs/libmythtv/videoout_d3d.cpp
@@ -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();
diff --git a/mythtv/libs/libmythtv/videoout_opengl.cpp b/mythtv/libs/libmythtv/videoout_opengl.cpp
index 9cd0503..5e5650d 100644
--- a/mythtv/libs/libmythtv/videoout_opengl.cpp
+++ b/mythtv/libs/libmythtv/videoout_opengl.cpp
@@ -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);
diff --git a/mythtv/libs/libmythtv/videoout_quartz.cpp b/mythtv/libs/libmythtv/videoout_quartz.cpp
index 710361f..9fff2e2 100644
--- a/mythtv/libs/libmythtv/videoout_quartz.cpp
+++ b/mythtv/libs/libmythtv/videoout_quartz.cpp
@@ -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 &&
diff --git a/mythtv/libs/libmythtv/videoout_vdpau.cpp b/mythtv/libs/libmythtv/videoout_vdpau.cpp
index e20e3c6..762d9cd 100644
--- a/mythtv/libs/libmythtv/videoout_vdpau.cpp
+++ b/mythtv/libs/libmythtv/videoout_vdpau.cpp
@@ -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)