From e81222198718c5359018627c66cd8c6a4fff5866 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 5 Apr 2025 10:16:18 +0200 Subject: [PATCH] Removed an unnecessary call to cDevice::GetVideoSize() --- HISTORY | 3 ++- dvbsubtitle.c | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/HISTORY b/HISTORY index 3b37b970..3d7d9c25 100644 --- a/HISTORY +++ b/HISTORY @@ -10090,7 +10090,7 @@ Video Disk Recorder Revision History - Added missing locks to SetMenuItem() functions. - Revised locking in cMenuSchedule and cMenuWhatsOn. -2025-03-28: +2025-04-05: - Added the "override" keyword to virtual functions reimplemented in derived classes. Plugins may want to do the same, but don't have to. @@ -10112,3 +10112,4 @@ Video Disk Recorder Revision History + The setup option "DVB/Display subtitles" now has three settings: "no" and "always" behave like before, the new "after rewind" turns on subtitles after a fast rewind during replay, and off again when the point where the rewind was started is reached. +- Removed an unnecessary call to cDevice::GetVideoSize(). diff --git a/dvbsubtitle.c b/dvbsubtitle.c index 0152dadc..6f5282fc 100644 --- a/dvbsubtitle.c +++ b/dvbsubtitle.c @@ -7,7 +7,7 @@ * Original author: Marco Schluessler * With some input from the "subtitles plugin" by Pekka Virtanen * - * $Id: dvbsubtitle.c 5.5 2025/03/28 22:49:17 kls Exp $ + * $Id: dvbsubtitle.c 5.6 2025/04/05 10:16:18 kls Exp $ */ #include "dvbsubtitle.h" @@ -1578,10 +1578,7 @@ void cDvbSubtitleConverter::SetOsdData(void) { int OsdWidth, OsdHeight; double OsdAspect; - int VideoWidth, VideoHeight; - double VideoAspect; cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect); - cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect); if (OsdWidth == displayWidth && OsdHeight == displayHeight) { osdFactorX = osdFactorY = 1.0; osdDeltaX = osdDeltaY = 0;