frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-03-13 15:28:15 +01:00
parent 71f02e4f80
commit 4bc2a502a4
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -7040,3 +7040,4 @@ Video Disk Recorder Revision History
- When estimating the remaining disk space (in hours), the average data rate of all - When estimating the remaining disk space (in hours), the average data rate of all
existing recordings is now taken into account. If this value can't be determined, existing recordings is now taken into account. If this value can't be determined,
the previous value of 25.75 MB/min is taken. the previous value of 25.75 MB/min is taken.
- No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin.

4
PLUGINS/src/osddemo/HISTORY
View File

@ -34,3 +34,7 @@ VDR Plugin 'osddemo' Revision History
2011-04-17: Version 0.2.2 2011-04-17: Version 0.2.2
- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel). - Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
2012-03-13: Version 0.2.3
- No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin,

63
PLUGINS/src/osddemo/osddemo.c
View File

@ -3,13 +3,13 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: osddemo.c 2.5 2011/04/17 13:05:13 kls Exp $ * $Id: osddemo.c 2.6 2012/03/13 15:17:33 kls Exp $
*/ */
#include <vdr/osd.h> #include <vdr/osd.h>
#include <vdr/plugin.h> #include <vdr/plugin.h>
static const char *VERSION = "0.2.2"; static const char *VERSION = "0.2.3";
static const char *DESCRIPTION = "Demo of arbitrary OSD setup"; static const char *DESCRIPTION = "Demo of arbitrary OSD setup";
static const char *MAINMENUENTRY = "Osd Demo"; static const char *MAINMENUENTRY = "Osd Demo";
@ -85,7 +85,7 @@ private:
cPixmap *destroyablePixmap; cPixmap *destroyablePixmap;
cPixmap *toggleablePixmap; cPixmap *toggleablePixmap;
virtual void Action(void); virtual void Action(void);
cPixmap *CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font = NULL); cPixmap *CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font);
public: public:
cTrueColorDemo(void); cTrueColorDemo(void);
virtual ~cTrueColorDemo(); virtual ~cTrueColorDemo();
@ -109,8 +109,6 @@ cTrueColorDemo::~cTrueColorDemo()
cPixmap *cTrueColorDemo::CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font) cPixmap *cTrueColorDemo::CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font)
{ {
if (!Font)
Font = cFont::GetFont(fontOsd);
const int h = Font->Height(s); const int h = Font->Height(s);
int w = Font->Width(s); int w = Font->Width(s);
cPixmap *Pixmap = osd->CreatePixmap(Layer, cRect((osd->Width() - w) / 2, Line, w, h)); cPixmap *Pixmap = osd->CreatePixmap(Layer, cRect((osd->Width() - w) / 2, Line, w, h));
@ -131,6 +129,9 @@ void cTrueColorDemo::Action(void)
cPixmap *TilePixmap = NULL; cPixmap *TilePixmap = NULL;
cPixmap *ScrollPixmap = NULL; cPixmap *ScrollPixmap = NULL;
cPixmap *AnimPixmap = NULL; cPixmap *AnimPixmap = NULL;
cFont *OsdFont = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize);
cFont *SmlFont = cFont::CreateFont(Setup.FontSml, Setup.FontSmlSize);
cFont *LrgFont = cFont::CreateFont(Setup.FontOsd, osd->Height() / 10);
int FrameTime = 40; // ms int FrameTime = 40; // ms
int FadeTime = 1000; // ms int FadeTime = 1000; // ms
int MoveTime = 4000; // ms int MoveTime = 4000; // ms
@ -202,10 +203,9 @@ void cTrueColorDemo::Action(void)
cRect r = ScrollPixmap->DrawPort(); cRect r = ScrollPixmap->DrawPort();
r.SetPoint(-r.X(), -r.Y()); r.SetPoint(-r.X(), -r.Y());
ScrollPixmap->Pan(cPoint(0, 0), r); ScrollPixmap->Pan(cPoint(0, 0), r);
const cFont *Font = cFont::GetFont(fontOsd);
cString s = cString::sprintf("Line %d", ++ScrollLineNumber); cString s = cString::sprintf("Line %d", ++ScrollLineNumber);
ScrollPixmap->DrawRectangle(cRect(0, ScrollPixmap->ViewPort().Height(), ScrollPixmap->DrawPort().Width(), ScrollPixmap->DrawPort().Height()), clrTransparent); ScrollPixmap->DrawRectangle(cRect(0, ScrollPixmap->ViewPort().Height(), ScrollPixmap->DrawPort().Width(), ScrollPixmap->DrawPort().Height()), clrTransparent);
ScrollPixmap->DrawText(cPoint(0, ScrollPixmap->ViewPort().Height()), s, clrYellow, clrTransparent, Font); ScrollPixmap->DrawText(cPoint(0, ScrollPixmap->ViewPort().Height()), s, clrYellow, clrTransparent, OsdFont);
ScrollStartTime = Now; ScrollStartTime = Now;
} }
else { else {
@ -234,18 +234,15 @@ void cTrueColorDemo::Action(void)
if (!Animated) { if (!Animated) {
switch (State) { switch (State) {
case 0: { case 0: {
if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) { FadeInPixmap = CreateTextPixmap("VDR", Line, 1, clrYellow, clrTransparent, LrgFont);
FadeInPixmap = CreateTextPixmap("VDR", Line, 1, clrYellow, clrTransparent, Font); if (FadeInPixmap)
if (FadeInPixmap) Line += FadeInPixmap->DrawPort().Height();
Line += FadeInPixmap->DrawPort().Height(); Start = cTimeMs::Now();
delete Font;
Start = cTimeMs::Now();
}
State++; State++;
} }
break; break;
case 1: { case 1: {
FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent); FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent, OsdFont);
if (FadeInPixmap) if (FadeInPixmap)
Line += FadeInPixmap->DrawPort().Height(); Line += FadeInPixmap->DrawPort().Height();
Start = cTimeMs::Now(); Start = cTimeMs::Now();
@ -253,7 +250,7 @@ void cTrueColorDemo::Action(void)
} }
break; break;
case 2: { case 2: {
FadeInPixmap = CreateTextPixmap("True Color OSD Demo", Line, 1, clrYellow, clrTransparent); FadeInPixmap = CreateTextPixmap("True Color OSD Demo", Line, 1, clrYellow, clrTransparent, OsdFont);
if (FadeInPixmap) if (FadeInPixmap)
Line += FadeInPixmap->DrawPort().Height(); Line += FadeInPixmap->DrawPort().Height();
Start = cTimeMs::Now(); Start = cTimeMs::Now();
@ -261,15 +258,12 @@ void cTrueColorDemo::Action(void)
} }
break; break;
case 3: { case 3: {
if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) { NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, LrgFont);
NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font); if (NextPixmap) {
delete Font; FadeInPixmap = NextPixmap;
if (NextPixmap) { Start = cTimeMs::Now();
FadeInPixmap = NextPixmap; StartLine = Line;
Start = cTimeMs::Now(); Line += NextPixmap->DrawPort().Height();
StartLine = Line;
Line += NextPixmap->DrawPort().Height();
}
} }
State++; State++;
} }
@ -301,7 +295,7 @@ void cTrueColorDemo::Action(void)
} }
break; break;
case 6: { case 6: {
TilePixmap = CreateTextPixmap("Tiled Pixmaps", StartLine, 1, clrRed, clrWhite); TilePixmap = CreateTextPixmap("Tiled Pixmaps", StartLine, 1, clrRed, clrWhite, OsdFont);
if (TilePixmap) { if (TilePixmap) {
TilePixmap->SetViewPort(TilePixmap->ViewPort().Grown(TilePixmap->DrawPort().Width(), TilePixmap->DrawPort().Height())); TilePixmap->SetViewPort(TilePixmap->ViewPort().Grown(TilePixmap->DrawPort().Width(), TilePixmap->DrawPort().Height()));
TilePixmap->SetAlpha(200); TilePixmap->SetAlpha(200);
@ -317,15 +311,14 @@ void cTrueColorDemo::Action(void)
} }
break; break;
case 7: { case 7: {
const cFont *Font = cFont::GetFont(fontOsd);
const char *Text = "Scrolling Pixmaps"; const char *Text = "Scrolling Pixmaps";
int w = Font->Width(Text); int w = OsdFont->Width(Text);
int h = Font->Height(); int h = OsdFont->Height();
if (cPixmap *Pixmap = osd->CreatePixmap(2, cRect((osd->Width() - w) / 2, StartLine, w, 2 * h), cRect(0, 0, w, 3 * h))) { if (cPixmap *Pixmap = osd->CreatePixmap(2, cRect((osd->Width() - w) / 2, StartLine, w, 2 * h), cRect(0, 0, w, 3 * h))) {
Pixmap->Clear(); Pixmap->Clear();
Pixmap->DrawText(cPoint(0, 0), Text, clrYellow, clrTransparent, Font); Pixmap->DrawText(cPoint(0, 0), Text, clrYellow, clrTransparent, OsdFont);
cString s = cString::sprintf("Line %d", ++ScrollLineNumber); cString s = cString::sprintf("Line %d", ++ScrollLineNumber);
Pixmap->DrawText(cPoint(0, Pixmap->ViewPort().Height()), s, clrYellow, clrTransparent, Font); Pixmap->DrawText(cPoint(0, Pixmap->ViewPort().Height()), s, clrYellow, clrTransparent, OsdFont);
ScrollPixmap = Pixmap; ScrollPixmap = Pixmap;
ScrollStart.Set(0, 0); ScrollStart.Set(0, 0);
ScrollEnd.Set(0, -h); ScrollEnd.Set(0, -h);
@ -335,9 +328,8 @@ void cTrueColorDemo::Action(void)
} }
break; break;
case 8: { case 8: {
const cFont *Font = cFont::GetFont(fontSml);
const char *Text = "Animation"; const char *Text = "Animation";
const int Size = Font->Width(Text) + 10; const int Size = SmlFont->Width(Text) + 10;
const int NumDots = 12; const int NumDots = 12;
const int AnimFrames = NumDots; const int AnimFrames = NumDots;
// Temporarily using pixmap layer 0 to have the text alpha blended: // Temporarily using pixmap layer 0 to have the text alpha blended:
@ -359,7 +351,7 @@ void cTrueColorDemo::Action(void)
AnimPixmap->DrawEllipse(cRect(x, y, Diameter, Diameter), ArgbToColor(0xFF, Color, Color, Color)); AnimPixmap->DrawEllipse(cRect(x, y, Diameter, Diameter), ArgbToColor(0xFF, Color, Color, Color));
Color -= Delta; Color -= Delta;
} }
AnimPixmap->DrawText(cPoint(0, Frame * Size), Text, clrBlack, clrTransparent, cFont::GetFont(fontSml), Size, Size, taCenter); AnimPixmap->DrawText(cPoint(0, Frame * Size), Text, clrBlack, clrTransparent, SmlFont, Size, Size, taCenter);
} }
AnimPixmap->SetLayer(3); // now setting the actual pixmap layer AnimPixmap->SetLayer(3); // now setting the actual pixmap layer
FadeInPixmap = AnimPixmap; FadeInPixmap = AnimPixmap;
@ -393,6 +385,9 @@ void cTrueColorDemo::Action(void)
if (Delta < FrameTime) if (Delta < FrameTime)
cCondWait::SleepMs(FrameTime - Delta); cCondWait::SleepMs(FrameTime - Delta);
} }
delete OsdFont;
delete SmlFont;
delete LrgFont;
} }
void cTrueColorDemo::Show(void) void cTrueColorDemo::Show(void)