From b9b9ace9a8d2d1c0beda1dc0a2ebc6be9b47c305 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 10 Jun 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.3=20-=20Fixed=20some=20spelling=20errors?= =?UTF-8?q?=20in=20'newplugin'=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-?= =?UTF-8?q?=20Fixed=20a=20busy=20loop=20in=20fast=20forward=20if=20the=20n?= =?UTF-8?q?ext=20video=20data=20file=20is=20missing=20=20=20(thanks=20to?= =?UTF-8?q?=20Reinhard=20Nissl).=20-=20Fixed=20handling=20frequencies=20in?= =?UTF-8?q?=20NitFilter::Process()=20(thanks=20to=20Anssi=20Hannula).=20-?= =?UTF-8?q?=20Fixed=20a=20race=20condition=20with=20signal=20handlers=20at?= =?UTF-8?q?=20program=20exit=20(thanks=20to=20Udo=20=20=20Richter).=20-=20?= =?UTF-8?q?Non-primary=20devices=20in=20Transfer=20mode=20are=20now=20also?= =?UTF-8?q?=20used=20for=20recording=20(thanks=20=20=20to=20Anssi=20Hannul?= =?UTF-8?q?a).=20-=20Fixed=20handling=20ChannelUp/Down=20keys=20if=20there?= =?UTF-8?q?=20is=20currently=20a=20replay=20running=20=20=20(thanks=20to?= =?UTF-8?q?=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20The=20new=20SVDRP=20comm?= =?UTF-8?q?and=20REMO=20can=20be=20used=20to=20turn=20VDR's=20remote=20con?= =?UTF-8?q?trol=20off=20and=20=20=20on=20in=20case=20other=20programs=20ne?= =?UTF-8?q?ed=20to=20be=20controlled=20(based=20on=20patches=20from=20Krzy?= =?UTF-8?q?sztof=20=20=20Parma=20and=20Helmut=20Auer).=20-=20Increased=20t?= =?UTF-8?q?he=20maximum=20number=20of=20CA=20system=20ids=20to=20cope=20wi?= =?UTF-8?q?th=20the=20AlphaCrypt=20=20=20CAM's=20version=203.11=20firmware?= =?UTF-8?q?.=20-=20Fixed=20getting=20the=20code=20setting=20from=20the=20l?= =?UTF-8?q?ocale=20(thanks=20to=20Matthias=20Schwarzott).=20-=20Implemente?= =?UTF-8?q?d=20support=20for=20Freetype=20fonts=20(based=20on=20a=20patch?= =?UTF-8?q?=20from=20Alexander=20Riedel).=20=20=20The=20font=20names=20and?= =?UTF-8?q?=20sizes=20can=20be=20adjusted=20in=20the=20"Setup/OSD"=20menu.?= =?UTF-8?q?=20=20=20Note=20that=20VDR=20now=20requires=20freetype=20fonts?= =?UTF-8?q?=20to=20be=20installed=20in=20=20=20/usr/share/fonts/truetype.?= =?UTF-8?q?=20-=20If=20the=20OSD=20device=20in=20use=20has=20at=20least=20?= =?UTF-8?q?8bpp=20bitmap=20depth=20and=20this=20is=20also=20=20=20used=20b?= =?UTF-8?q?y=20the=20current=20skin,=20Freetype=20fonts=20are=20displayed?= =?UTF-8?q?=20"anti-aliased".=20=20=20The=20new=20setup=20parameter=20"OSD?= =?UTF-8?q?/Anti-alias"=20can=20be=20used=20to=20turn=20this=20off.=20-=20?= =?UTF-8?q?The=20new=20function=20cOsd::SetAntiAliasGranularity()=20can=20?= =?UTF-8?q?be=20used=20to=20help=20the=20OSD=20=20=20in=20managing=20the?= =?UTF-8?q?=20available=20color=20palette=20entries=20when=20doing=20anti-?= =?UTF-8?q?aliasing.=20=20=20Skins=20that=20use=208bpp=20bitmaps=20can=20c?= =?UTF-8?q?all=20this=20function=20with=20the=20maximum=20number=20=20=20o?= =?UTF-8?q?f=20colors=20used,=20and=20the=20maximum=20number=20of=20color?= =?UTF-8?q?=20combinations.=20The=20OSD=20will=20=20=20then=20evenly=20spl?= =?UTF-8?q?it=20the=20available=20palette=20entries=20between=20the=20vari?= =?UTF-8?q?ous=20colors=20=20=20combinations,=20so=20that=20fonts=20can=20?= =?UTF-8?q?be=20"anti-aliased".=20By=20default=20a=20total=20of=20=20=2010?= =?UTF-8?q?=20colors=20and=2010=20combinations=20is=20assumed.=20-=20The?= =?UTF-8?q?=20pixel=20fonts=20have=20been=20completely=20removed=20from=20?= =?UTF-8?q?the=20VDR=20source.=20-=20VDR=20is=20now=20"UTF-8=20aware".=20I?= =?UTF-8?q?t=20handles=20strings=20according=20to=20the=20character=20=20?= =?UTF-8?q?=20encoding=20used=20on=20the=20user's=20system.=20All=20intern?= =?UTF-8?q?ationalization=20strings=20and=20=20=20incoming=20SI=20data=20a?= =?UTF-8?q?re=20converted=20to=20the=20system=20encoding.=20-=20Plugins=20?= =?UTF-8?q?that=20handle=20strings=20need=20to=20be=20aware=20that=20on=20?= =?UTF-8?q?systems=20with=20UTF-8=20=20=20encoding=20a=20"character=20symb?= =?UTF-8?q?ol"=20may=20consist=20of=20more=20than=20a=20single=20byte=20in?= =?UTF-8?q?=20=20=20memory.=20The=20functions=20and=20macros=20named=20Utf?= =?UTF-8?q?8...()=20can=20be=20used=20to=20handle=20=20=20strings=20withou?= =?UTF-8?q?t=20needing=20to=20care=20about=20the=20underlying=20character?= =?UTF-8?q?=20encoding=20=20=20(see=20tools.h=20for=20details).=20-=20Even?= =?UTF-8?q?=20though=20the=20weekdays=20of=20repeating=20timers=20are=20pr?= =?UTF-8?q?esented=20to=20the=20user=20as=20UTF-8=20=20=20characters=20in?= =?UTF-8?q?=20the=20OSD,=20the=20timers.conf=20file=20and=20the=20SVDRP=20?= =?UTF-8?q?timer=20commands=20still=20=20=20use=20single=20byte=20characte?= =?UTF-8?q?rs=20("MTWTFSS")=20to=20make=20sure=20this=20information=20is?= =?UTF-8?q?=20handled=20=20=20correctly=20between=20systems=20with=20diffe?= =?UTF-8?q?rent=20character=20encodings.=20-=20Added=20a=20missing=20i18n?= =?UTF-8?q?=20string=20for=20"CAM"=20in=20the=20Turkish=20OSD=20texts.=20-?= =?UTF-8?q?=20Improved=20editing=20strings=20that=20are=20too=20long=20to?= =?UTF-8?q?=20fit=20into=20the=20editable=20area.=20-=20Changes=20to=20the?= =?UTF-8?q?=20OSD=20settings=20in=20the=20"Setup/OSD"=20menu=20now=20immed?= =?UTF-8?q?iately=20take=20effect=20=20=20when=20the=20"Ok"=20key=20is=20p?= =?UTF-8?q?ressed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- osd.h | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'osd.h') diff --git a/osd.h b/osd.h index 0e9eb3c..3adfd7f 100644 --- a/osd.h +++ b/osd.h @@ -4,12 +4,13 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.h 1.53 2006/02/26 14:45:05 kls Exp $ + * $Id: osd.h 1.54 2007/06/10 12:15:52 kls Exp $ */ #ifndef __OSD_H #define __OSD_H +#include #include #include #include "font.h" @@ -41,7 +42,7 @@ enum eOsdError { oeOk, oeUnknown, }; -typedef uint32_t tColor; +typedef uint32_t tColor; // see also font.h typedef uint8_t tIndex; class cPalette { @@ -50,11 +51,22 @@ private: int bpp; int maxColors, numColors; bool modified; + double antiAliasGranularity; protected: typedef tIndex tIndexes[MAXNUMCOLORS]; public: cPalette(int Bpp = 8); ///< Initializes the palette with the given color depth. + void SetAntiAliasGranularity(uint FixedColors, uint BlendColors); + ///< Allows the system to optimize utilization of the limited color + ///< palette entries when generating blended colors for anti-aliasing. + ///< FixedColors is the maximum number of colors used, and BlendColors + ///< is the maximum number of foreground/background color combinations + ///< used with anti-aliasing. If this function is not called with + ///< useful values, the palette may be filled up with many shades of + ///< a single color combination, and may not be able to serve all + ///< requested colors. By default the palette assumes there will be + ///< 10 fixed colors and 10 color combinations. int Bpp(void) { return bpp; } void Reset(void); ///< Resets the palette, making it contain no colors. @@ -62,7 +74,7 @@ public: ///< Returns the index of the given Color (the first color has index 0). ///< If Color is not yet contained in this palette, it will be added if ///< there is a free slot. If the color can't be added to this palette, - ///< 0 will be returned. + ///< the closest existing color will be returned. tColor Color(int Index) { return Index < maxColors ? color[Index] : 0; } ///< Returns the color at the given Index. If Index is outside the valid ///< range, 0 will be returned. @@ -88,6 +100,18 @@ public: void Replace(const cPalette &Palette); ///< Replaces the colors of this palette with the colors from the given ///< palette. + tColor Blend(tColor ColorFg, tColor ColorBg, uint8_t Level); + ///< Determines a color that consists of a linear blend between ColorFg + ///< and ColorBg. If Level is 0, the result is ColorBg, if it is 255, + ///< the result is ColorFg. If SetAntiAliasGranularity() has been called previously, + ///< Level will be mapped to a limited range of levels that allow to make best + ///< use of the palette entries. + int ClosestColor(tColor Color, int MaxDiff = INT_MAX); + ///< Returns the index of a color in this paltte that is closest to the given + ///< Color. MaxDiff can be used to control the maximum allowed color difference. + ///< If no color with a maximum difference of MaxDiff can be found, -1 will + ///< be returned. With the default value of INT_MAX, there will always be + ///< a valid color index returned, but the color may be completely different. }; enum eTextAlignment { taCenter = 0x00, @@ -98,6 +122,8 @@ enum eTextAlignment { taCenter = 0x00, taDefault = taTop | taLeft }; +class cFont; + class cBitmap : public cPalette { private: tIndex *bitmap; @@ -202,6 +228,8 @@ public: ///< 7: vertical, falling, upper const tIndex *Data(int x, int y); ///< Returns the address of the index byte at the given coordinates. + tColor GetColor(int x, int y) { return Color(*Data(x, y)); } + ///< Returns the color at the given coordinates. }; struct tArea { @@ -247,6 +275,16 @@ public: int Top(void) { return top; } int Width(void) { return width; } int Height(void) { return height; } + void SetAntiAliasGranularity(uint FixedColors, uint BlendColors); + ///< Allows the system to optimize utilization of the limited color + ///< palette entries when generating blended colors for anti-aliasing. + ///< FixedColors is the maximum number of colors used, and BlendColors + ///< is the maximum number of foreground/background color combinations + ///< used with anti-aliasing. If this function is not called with + ///< useful values, the palette may be filled up with many shades of + ///< a single color combination, and may not be able to serve all + ///< requested colors. By default the palette assumes there will be + ///< 10 fixed colors and 10 color combinations. cBitmap *GetBitmap(int Area); ///< Returns a pointer to the bitmap for the given Area, or NULL if no ///< such bitmap exists. -- cgit v1.2.3