diff --git a/HISTORY b/HISTORY index 37f1e18..d3289ac 100644 --- a/HISTORY +++ b/HISTORY @@ -432,3 +432,7 @@ VDR Plugin 'femon' Revision History - Added initial support for PVRINPUT devices (Thanks to Winfried Köhler). - Added initial support for IPTV devices. + +2012-03-03: Version 1.7.14 + +- Updated for vdr-1.7.25. diff --git a/femon.c b/femon.c index 7cdff2b..0e8fdb9 100644 --- a/femon.c +++ b/femon.c @@ -14,15 +14,15 @@ #include "femonservice.h" #include "femontools.h" -#if defined(APIVERSNUM) && APIVERSNUM < 10723 -#error "VDR-1.7.23 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 10725 +#error "VDR-1.7.25 API version or greater is required!" #endif #ifndef GITVERSION #define GITVERSION "" #endif -static const char VERSION[] = "1.7.13" GITVERSION; +static const char VERSION[] = "1.7.14" GITVERSION; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); diff --git a/femonosd.c b/femonosd.c index fa5c256..dfd2978 100644 --- a/femonosd.c +++ b/femonosd.c @@ -200,7 +200,7 @@ cFemonOsd::cFemonOsd() memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo)); m_SvdrpConnection.handle = -1; femonSymbols.Refresh(); - m_Font = cFont::CreateFont(Setup.FontSml, min(max(Setup.FontSmlSize, MINFONTSIZE), MAXFONTSIZE)); + m_Font = cFont::CreateFont(Setup.FontSml, constrain(Setup.FontSmlSize, MINFONTSIZE, MAXFONTSIZE)); if (!m_Font || !m_Font->Height()) { m_Font = new cFemonDummyFont; error("cFemonOsd::cFemonOsd() cannot create required font.");