diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | osd.c | 8 | ||||
| -rw-r--r-- | osd.h | 4 |
5 files changed, 13 insertions, 9 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index effd2968..07c0add6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1958,6 +1958,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de> calling "vdr --help" for fixing cDevice::ToggleMute() for suggestions that led to implementing cOsd::SetOsdPosition() etc. + for fixing a typo in the function name of cOsd::SetOsdPosition() and adding a range + check to it Pekka Mauno <pekka.mauno@iki.fi> for fixing cSchedule::GetFollowingEvent() in case there is currently no present @@ -5285,3 +5285,5 @@ Video Disk Recorder Revision History Richter). - Improved numdigits(), isnumber() and strreplace() (thanks to Tobias Bratfisch). - Fixed clearing color buttons in the 'curses' skin (thanks to Udo Richter). +- Fixed a typo in the function name of cOsd::SetOsdPosition() and added a range + check to it (thanks to Christoph Haubrich). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.293 2007/07/20 12:31:38 kls Exp $ + * $Id: config.h 1.294 2007/07/20 14:52:05 kls Exp $ */ #ifndef __CONFIG_H @@ -27,8 +27,8 @@ // The plugin API's version number: -#define APIVERSION "1.5.5" -#define APIVERSNUM 10505 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.5.6" +#define APIVERSNUM 10506 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 1.70 2007/06/17 13:54:34 kls Exp $ + * $Id: osd.c 1.71 2007/07/20 14:51:36 kls Exp $ */ #include "osd.h" @@ -668,12 +668,12 @@ cOsd::~cOsd() isOpen--; } -void cOsd::SetOsdPostion(int Left, int Top, int Width, int Height) +void cOsd::SetOsdPosition(int Left, int Top, int Width, int Height) { osdLeft = Left; osdTop = Top; - osdWidth = Width; - osdHeight = Height; + osdWidth = min(max(Width, MINOSDWIDTH), MAXOSDWIDTH); + osdHeight = min(max(Height, MINOSDHEIGHT), MAXOSDHEIGHT); } void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors) @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.h 1.55 2007/06/17 13:59:22 kls Exp $ + * $Id: osd.h 1.56 2007/07/20 14:50:17 kls Exp $ */ #ifndef __OSD_H @@ -276,7 +276,7 @@ public: static int OsdTop(void) { return osdTop ? osdTop : Setup.OSDTop; } static int OsdWidth(void) { return osdWidth ? osdWidth : Setup.OSDWidth; } static int OsdHeight(void) { return osdHeight ? osdHeight : Setup.OSDHeight; } - static void SetOsdPostion(int Left, int Top, int Width, int Height); + static void SetOsdPosition(int Left, int Top, int Width, int Height); ///< Sets the position and size of the OSD to the given values. ///< This may be useful for plugins that determine the scaling of the ///< video image and need to scale the OSD accordingly to fit on the |