diff --git a/femonosd.c b/femonosd.c index 29c9926..1079bb3 100644 --- a/femonosd.c +++ b/femonosd.c @@ -490,7 +490,6 @@ void cFemonOsd::DrawInfoWindow(void) OSDDRAWINFOLEFT(tr("Protocol"), *data.protocol); offset += OSDROWHEIGHT; OSDDRAWINFOLEFT(tr("Bitrate"), *data.bitrate); - offset += OSDROWHEIGHT; } } } diff --git a/femonsymbol.c b/femonsymbol.c index 03a6a25..15ad09c 100644 --- a/femonsymbol.c +++ b/femonsymbol.c @@ -53,6 +53,7 @@ #include "symbols/format480i.xpm" #include "symbols/format480p.xpm" +static cBitmap bmOnePixel(1, 1, 1); static cBitmap bmStereo(stereo_xpm); static cBitmap bmMonoLeft(monoleft_xpm); static cBitmap bmMonoRight(monoright_xpm); @@ -134,6 +135,7 @@ bool cFemonSymbolCache::Populate(void) Flush(); // pushing order must follow the enumeration - keep original proportions except for frontend status ones + cacheM.Append(&bmOnePixel); // SYMBOL_ONEPIXEL cacheM.Append(bmStereo.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_STEREO cacheM.Append(bmMonoLeft.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MONO_LEFT cacheM.Append(bmMonoRight.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MONO_RIGHT @@ -197,7 +199,7 @@ bool cFemonSymbolCache::Flush(void) cBitmap& cFemonSymbolCache::Get(eSymbols symbolP) { - cBitmap *bitmapM = NULL; + cBitmap *bitmapM = cacheM[SYMBOL_ONEPIXEL]; if (symbolP < cacheM.Size()) bitmapM = cacheM[symbolP]; diff --git a/femonsymbol.h b/femonsymbol.h index 825ba13..4fe14c6 100644 --- a/femonsymbol.h +++ b/femonsymbol.h @@ -12,6 +12,7 @@ #include enum eSymbols { + SYMBOL_ONEPIXEL, SYMBOL_STEREO, SYMBOL_MONO_LEFT, SYMBOL_MONO_RIGHT, @@ -77,8 +78,8 @@ public: ~cFemonSymbolCache(); void Refresh(); cBitmap& Get(eSymbols symbolP); - int GetSpacing() { return int(yFactorM * DEFAULT_SPACING); } - int GetRounding() { return int(yFactorM * DEFAULT_ROUNDING); } + int GetSpacing() { return int(yFactorM * cFemonSymbolCache::DEFAULT_SPACING); } + int GetRounding() { return int(yFactorM * cFemonSymbolCache::DEFAULT_ROUNDING); } }; extern cFemonSymbolCache femonSymbols;