diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | displaymenuview.c | 24 | ||||
| -rw-r--r-- | displaymenuview.h | 4 |
3 files changed, 17 insertions, 14 deletions
@@ -50,6 +50,9 @@ INCLUDES += -I/usr/include/ImageMagick DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +ifdef YAEPG +DEFINES += -DUSE_YAEPG +endif ### The object files (add further files here): OBJS = $(PLUGIN).o diff --git a/displaymenuview.c b/displaymenuview.c index abd921c..53fe6b2 100644 --- a/displaymenuview.c +++ b/displaymenuview.c @@ -41,11 +41,11 @@ cNopacityDisplayMenuView::~cNopacityDisplayMenuView(void) { #ifdef USE_YAEPG if (config.scalePicture) { tArea availableArea; - availableArea.x1 = 0; - availableArea.y1 = 0; - availableArea.x2 = osdWidth; - availableArea.y2 = osdHeight; - ScalePreserveAspect(osd->vidWin, 4.0/3.0, availableArea); + availableArea.x1 = -osdLeft; + availableArea.y1 = -osdTop; + availableArea.x2 = osdWidth + osdLeft; + availableArea.y2 = osdHeight + osdTop; + ScalePreserveAspect(osd->vidWin, vidAspect, availableArea); osd->vidWin.bpp = 12; } #endif @@ -57,7 +57,7 @@ cOsd *cNopacityDisplayMenuView::createOsd(void) { osdWidth = cOsd::OsdWidth(); osdHeight = cOsd::OsdHeight(); osd = CreateOsd(osdLeft, osdTop, osdWidth, osdHeight); - cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect); + cDevice::PrimaryDevice()->GetVideoSize(vidWidth, vidHeight, vidAspect); return osd; } @@ -298,7 +298,7 @@ void cNopacityDisplayMenuView::AdjustContentBackground(bool contentNarrow, bool availableArea.y1 = osdTop + headerHeight; availableArea.x2 = contentWidthFull; availableArea.y2 = availableArea.y1 + contentHeight; - ScalePreserveAspect(osd->vidWin, aspect, availableArea); + ScalePreserveAspect(osd->vidWin, vidAspect, availableArea); osd->vidWin.bpp = 12; } #endif @@ -307,11 +307,11 @@ void cNopacityDisplayMenuView::AdjustContentBackground(bool contentNarrow, bool #ifdef USE_YAEPG if (config.scalePicture) { tArea availableArea; - availableArea.x1 = 0; - availableArea.y1 = 0; - availableArea.x2 = osdWidth; - availableArea.y2 = osdHeight; - ScalePreserveAspect(osd->vidWin, aspect, availableArea); + availableArea.x1 = -osdLeft; + availableArea.y1 = -osdTop; + availableArea.x2 = osdWidth + osdLeft; + availableArea.y2 = osdHeight + osdTop; + ScalePreserveAspect(osd->vidWin, vidAspect, availableArea); osd->vidWin.bpp = 12; } #endif diff --git a/displaymenuview.h b/displaymenuview.h index 28ec7ec..bd621ca 100644 --- a/displaymenuview.h +++ b/displaymenuview.h @@ -43,8 +43,8 @@ class cNopacityDisplayMenuView { cFont *fontMessage; int osdWidth, osdHeight; int osdLeft, osdTop; - int screenWidth, screenHeight; - double aspect; + int vidWidth, vidHeight; + double vidAspect; int widthScrollbar; int dateWidth; int headerHeight, footerHeight, contentHeight; |