summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-08-19 17:15:37 +0000
committerphintuka <phintuka>2009-08-19 17:15:37 +0000
commit6e709c0a5fcd850b46e560dd52b9018ef8c7c130 (patch)
tree5e1deda7d2840bc06ddc6af02f0effe7f88fc6b2
parent2d866e068ea0d3e11391440c89b79b4e2f66cc65 (diff)
downloadxineliboutput-6e709c0a5fcd850b46e560dd52b9018ef8c7c130.tar.gz
xineliboutput-6e709c0a5fcd850b46e560dd52b9018ef8c7c130.tar.bz2
Use user-configured OSD resolution for vdr-1.7.8+
-rw-r--r--osd.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/osd.c b/osd.c
index f74b78a0..8a670d2c 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c,v 1.37 2009-05-03 20:35:36 phintuka Exp $
+ * $Id: osd.c,v 1.38 2009-08-19 17:15:37 phintuka Exp $
*
*/
@@ -364,6 +364,16 @@ eOsdError cXinelibOsd::SetAreas(const tArea *Areas, int NumAreas)
return oeTooManyAreas;
}
+#if VDRVERSNUM >= 10708
+
+ double Aspect;
+ int W, H;
+ m_Device->GetOsdSize(W, H, Aspect);
+ m_ExtentWidth = W;
+ m_ExtentHeight = H;
+
+#else
+
// Detect full OSD area size
if(Left() + Width() > 720 || Top() + Height() > 576) {
m_ExtentWidth = Setup.OSDWidth + 2 * Setup.OSDLeft;
@@ -375,6 +385,9 @@ eOsdError cXinelibOsd::SetAreas(const tArea *Areas, int NumAreas)
m_ExtentWidth = 720;
m_ExtentHeight = 576;
}
+
+#endif
+
CmdSize(m_ExtentWidth, m_ExtentHeight);
return Result;