summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2015-02-20 16:04:16 +0000
committerphintuka <phintuka>2015-02-20 16:04:16 +0000
commitfd21e7a0936b984e76eb01c308ccc5a811c68918 (patch)
tree2aaa3668984279eb06a1b3e6ac0972d066374830
parentcefbad82636aa1905797b670d9b6804e432d3f09 (diff)
downloadxineliboutput-fd21e7a0936b984e76eb01c308ccc5a811c68918.tar.gz
xineliboutput-fd21e7a0936b984e76eb01c308ccc5a811c68918.tar.bz2
Adopt to changes in vdr 2.2.0
-rw-r--r--osd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/osd.c b/osd.c
index 88b5b358..db73e14d 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.53 2015-02-20 16:01:04 phintuka Exp $
+ * $Id: osd.c,v 1.54 2015-02-20 16:04:16 phintuka Exp $
*
*/
@@ -515,12 +515,16 @@ void cXinelibOsd::Flush(void)
if (IsTrueColor()) {
LOCK_PIXMAPS;
- while (cPixmapMemory *pm = RenderPixmaps()) {
+ while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory*>(RenderPixmaps())) {
int w = pm->ViewPort().Width();
int h = pm->ViewPort().Height();
int d = w * sizeof(tColor);
CmdArgb(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), w, h, pm->Data(), h * d);
+#if VDRVERSNUM >= 20200
+ DestroyPixmap(pm);
+#else
delete pm;
+#endif
}
return;