summaryrefslogtreecommitdiff
path: root/osd.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-06-17 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-06-17 18:00:00 +0200
commitb1e4da3be6552f58f3890bf2ad48879823d2e130 (patch)
treecf42a1e6b296956b82a2820948c7b90dbcddf26e /osd.h
parentb9b9ace9a8d2d1c0beda1dc0a2ebc6be9b47c305 (diff)
downloadvdr-patch-lnbsharing-b1e4da3be6552f58f3890bf2ad48879823d2e130.tar.gz
vdr-patch-lnbsharing-b1e4da3be6552f58f3890bf2ad48879823d2e130.tar.bz2
Version 1.5.4vdr-1.5.4
- Increased APIVERSION (forgot to do that in 1.5.2 and 1.5.3). - Fixed a crash in i18n character set conversion (thanks to Alexander Riedel, Jose Alberto Reguero and Christian Wieninger for patches that cured part of the problem). - Adjusted the 'skincurses' plugin to UTF-8 handling. - Using nl_langinfo(CODESET) to determine the local codeset to use (thanks to Thomas Günther). The codeset names in 'libsi/si.c' have been changed to the canonical spelling with '-' (thanks to Ludwig Nussel for pointing this out). - Modified handling invalid characters in VFAT mode. - Replaced strn0cpy() with Utf8Strn0Cpy() where necessary. - Now using 'fontconfig' to determine which fonts to use (thanks to Anssi Hannula for code and hints on how to do this). - If no fonts are installed, VDR now uses a dummy font that doesn't actually draw any text, and logs an error message. - The new function cFont::CreateFont() can be used by plugins to create and use fonts of their own, independent of VDR's standard fonts. - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Changed the parameter "OSD font" to "Default font" in "Setup/OSD" (suggested by Rolf Ahrenberg). - Fixed handling detached processes in SystemExec() (thanks to Udo Richter). - The info.vdr file now also stores the name of the channel, and the new function cRecordingInfo::ChannelName() returns this information if available (based on a patch from Alexander Hans). - The new function cOsd::SetOsdPosition() can be used to dynamically change the position and size of the OSD (based on a request from Christoph Haubrich). Plugins that implement skins should no longer use Setup.OSDWidth etc. directly, but should rather use cOsd::OsdWidth() etc. instead. Currently a change to the OSD position will only apply to newly opened OSDs.
Diffstat (limited to 'osd.h')
-rw-r--r--osd.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/osd.h b/osd.h
index 3adfd7f..0753058 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.h 1.54 2007/06/10 12:15:52 kls Exp $
+ * $Id: osd.h 1.55 2007/06/17 13:59:22 kls Exp $
*/
#ifndef __OSD_H
@@ -13,6 +13,7 @@
#include <limits.h>
#include <stdio.h>
#include <stdint.h>
+#include "config.h"
#include "font.h"
#define MAXNUMCOLORS 256
@@ -245,6 +246,7 @@ struct tArea {
class cOsd {
friend class cOsdProvider;
private:
+ static int osdLeft, osdTop, osdWidth, osdHeight;
static int isOpen;
cBitmap *savedRegion;
cBitmap *bitmaps[MAXOSDAREAS];
@@ -270,6 +272,15 @@ protected:
public:
virtual ~cOsd();
///< Shuts down the OSD.
+ static int OsdLeft(void) { return osdLeft ? osdLeft : Setup.OSDLeft; }
+ 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);
+ ///< 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
+ ///< screen.
static int IsOpen(void) { return isOpen; }
int Left(void) { return left; }
int Top(void) { return top; }