diff -Nru '--exclude=po' '--exclude=*.*o' '--exclude=.dependencies' mosaic-0.1.0/mosaic.c mosaic-0.1.1/mosaic.c --- mosaic-0.1.0/mosaic.c 2012-01-02 16:50:07.000000000 +0000 +++ mosaic-0.1.1/mosaic.c 2012-12-02 13:15:32.000000000 +0000 @@ -19,7 +19,7 @@ #define trNOOP(s) (s) #endif -static const char *VERSION = "0.1.0"; +static const char *VERSION = "0.1.1"; static const char *DESCRIPTION = trNOOP("Browse mosaic channel"); static const char *MAINMENUENTRY = trNOOP("Mosaic"); diff -Nru '--exclude=po' '--exclude=*.*o' '--exclude=.dependencies' mosaic-0.1.0/mosaicosd.c mosaic-0.1.1/mosaicosd.c --- mosaic-0.1.0/mosaicosd.c 2012-01-02 16:50:07.000000000 +0000 +++ mosaic-0.1.1/mosaicosd.c 2012-12-02 13:12:48.000000000 +0000 @@ -217,6 +217,9 @@ void cMosaicOsd::Show() { + static const cFont *font = cFont::GetFont(fontOsd); + static const int LINEHEIGHT = font->Height(); + if (config.mosaic1 > 0) mosaic[0] = config.mosaic1; if (config.mosaic2 > 0) @@ -341,7 +344,7 @@ { eOSState state = cOsdObject::ProcessKey(Key); if (state == osUnknown) { - switch (Key) { + switch (Key & ~k_Repeat) { case kBack: if (extraInfo == false) { cChannel *Channel = Channels.GetByNumber(ChannelOrigNumber); @@ -384,9 +387,7 @@ } } break; */ - case kLeft|k_Repeat: case kLeft: - case kRight|k_Repeat: case kRight: if (extraInfo == false) { int oldmos = mos; @@ -436,9 +437,7 @@ lastTime = cTimeMs::Now(); } break; - case kUp|k_Repeat: case kUp: - case kDown|k_Repeat: case kDown: { if (extraInfo == false) { if (NORMALKEY(Key) == kDown) @@ -551,7 +550,6 @@ } } break; - case kYellow|k_Repeat: case kYellow: { if (extraInfo == false) { // Scroll back in time @@ -564,7 +562,6 @@ } } break; - case kBlue|k_Repeat: case kBlue: { if (extraInfo == false) { // Scroll back in time @@ -669,6 +666,8 @@ // to display channel Infos ... void cMosaicOsd::DisplayInfo(int delta) { + static const cFont *font = cFont::GetFont(fontOsd); + static const int LINEHEIGHT = font->Height(); const int t = 140; //bool withInfo=true; @@ -775,6 +774,8 @@ } void cMosaicOsd::DisplayExtraInfo() { + static const cFont *font = cFont::GetFont(fontOsd); + static const int LINEHEIGHT = font->Height(); int height = config.height; int x0 = 70; int width = config.width-1-config.right; @@ -829,6 +830,7 @@ } char * cMosaicOsd::WrapText(const char *Text, int Width, int *Height) { + static const cFont *font = cFont::GetFont(fontOsd); int Lines = 1; char *t = strdup(Text); char *Blank = NULL; diff -Nru '--exclude=po' '--exclude=*.*o' '--exclude=.dependencies' mosaic-0.1.0/mosaicosd.h mosaic-0.1.1/mosaicosd.h --- mosaic-0.1.0/mosaicosd.h 2012-01-02 16:50:07.000000000 +0000 +++ mosaic-0.1.1/mosaicosd.h 2012-12-02 10:07:11.000000000 +0000 @@ -8,8 +8,6 @@ #include "gfxtools.h" #include "mosaicbmp.h" -static const cFont *font = cFont::GetFont(fontOsd); -static const int LINEHEIGHT = font->Height(); #define NBLINES 4 class cMosaicOsd : public cOsdObject { diff -Nru '--exclude=po' '--exclude=*.*o' '--exclude=.dependencies' mosaic-0.1.0/README mosaic-0.1.1/README --- mosaic-0.1.0/README 2012-01-02 16:50:07.000000000 +0000 +++ mosaic-0.1.1/README 2012-12-02 13:19:11.000000000 +0000 @@ -42,6 +42,10 @@ VDR Plugin 'mosaic' Revision History ----------------------------------- +2012-12-02: Version 0.1.1 + - Fix warning: case value 'x' not in enumerated type 'eKeys' [-Wswitch] + - bugfix SetAreas + 2008-02-25: Version 0.1.0 - Add supprort for mosaic channel n°5 - Test for mosaic.conf at startup