1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Some fixes in the "osddemo" plugin

This commit is contained in:
Klaus Schmidinger 2011-03-28 16:26:49 +02:00
parent 4ed9d95394
commit fa85bb7c01
3 changed files with 14 additions and 5 deletions

View File

@ -6557,7 +6557,7 @@ Video Disk Recorder Revision History
- The original display size of subtitles is now used to scale them properly when - The original display size of subtitles is now used to scale them properly when
displaying them on an HD OSD. displaying them on an HD OSD.
2011-03-27: Version 1.7.18 2011-03-28: Version 1.7.18
- Changed -O2 to -O3 in Make.config.template (reported by Matti Lehtimäki). - Changed -O2 to -O3 in Make.config.template (reported by Matti Lehtimäki).
- Added a missing 'default' case in cPixmapMemory::DrawEllipse(). - Added a missing 'default' case in cPixmapMemory::DrawEllipse().
@ -6589,3 +6589,6 @@ Video Disk Recorder Revision History
have been macros introduced to work around this problem in the first place. There have been macros introduced to work around this problem in the first place. There
should have been "real" format specifiers defined that address this. These macros should have been "real" format specifiers defined that address this. These macros
are nothing but an ugly workaround. are nothing but an ugly workaround.
- Added Cancel(3) to ~cTrueColorDemo() in the "osddemo" plugin (thanks to Reinhard Nissl).
- Added a missing font deletion in cTrueColorDemo::Action() in the "osddemo" plugin
(thanks to Reinhard Nissl).

View File

@ -25,3 +25,8 @@ VDR Plugin 'osddemo' Revision History
2011-02-20: Version 0.2.0 2011-02-20: Version 0.2.0
- Added support for TrueColor OSD. - Added support for TrueColor OSD.
2011-03-28: Version 0.2.1
- Added Cancel(3) to ~cTrueColorDemo() (thanks to Reinhard Nissl).
- Added a missing font deletion in cTrueColorDemo::Action() (thanks to Reinhard Nissl).

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.3 2011/02/26 12:08:13 kls Exp $ * $Id: osddemo.c 2.4 2011/03/28 16:23:21 kls Exp $
*/ */
#include <vdr/osd.h> #include <vdr/osd.h>
#include <vdr/plugin.h> #include <vdr/plugin.h>
static const char *VERSION = "0.2.0"; static const char *VERSION = "0.2.1";
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";
@ -103,6 +103,7 @@ cTrueColorDemo::cTrueColorDemo(void)
cTrueColorDemo::~cTrueColorDemo() cTrueColorDemo::~cTrueColorDemo()
{ {
Cancel(3);
delete osd; delete osd;
} }
@ -262,9 +263,9 @@ void cTrueColorDemo::Action(void)
case 3: { case 3: {
if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) { if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font); NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font);
if (NextPixmap) { if (NextPixmap)
FadeInPixmap = NextPixmap; FadeInPixmap = NextPixmap;
} delete Font;
Start = cTimeMs::Now(); Start = cTimeMs::Now();
StartLine = Line; StartLine = Line;
Line += NextPixmap->DrawPort().Height(); Line += NextPixmap->DrawPort().Height();