From 0cdf675ff7cfb930ec21dbecab41cb6d681001e0 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 15 Nov 2014 09:54:51 +0100 Subject: fixed positioning of scaled video window if borders are configured --- HISTORY | 1 + libtemplate/templateview.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 0faf378..fbf419d 100644 --- a/HISTORY +++ b/HISTORY @@ -58,4 +58,5 @@ Version 0.0.3 - added dedicated tokens for posters and banners in in displaychannel and displayreplay - added Plugin Interface - fixed crash when clearing a message in displaychannel and displayreplay +- fixed positioning of scaled video window if borders are configured diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c index e53d215..95b3286 100644 --- a/libtemplate/templateview.c +++ b/libtemplate/templateview.c @@ -192,8 +192,8 @@ bool cTemplateView::GetScalingWindow(cRect &scalingWindow) { if (!parameters) return false; bool doScale = false; - int scaleX = parameters->GetNumericParameter(ptScaleTvX); - int scaleY = parameters->GetNumericParameter(ptScaleTvY); + int scaleX = parameters->GetNumericParameter(ptScaleTvX) + cOsd::OsdLeft(); + int scaleY = parameters->GetNumericParameter(ptScaleTvY) + cOsd::OsdTop(); int scaleWidth = parameters->GetNumericParameter(ptScaleTvWidth); int scaleHeight = parameters->GetNumericParameter(ptScaleTvHeight); if (scaleX > -1 && scaleY > -1 && scaleWidth > -1 && scaleHeight > -1) { -- cgit v1.2.3