summaryrefslogtreecommitdiff
path: root/logo.c
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2007-06-25 12:44:11 +0200
committerAndreas Mair <amair.sob@googlemail.com>2007-06-25 12:44:11 +0200
commitfc61e314442d22bb7886dba77380497b776fcb62 (patch)
treeb6e891bb760438f2209d5f24ab489d8d01579026 /logo.c
parentae9c6ccad6ba1ab419fe73d9e75f545cbbb62c96 (diff)
downloadvdr-plugin-skinenigmang-0.0.5rc3.tar.gz
vdr-plugin-skinenigmang-0.0.5rc3.tar.bz2
2007-06-25: Version 0.0.5rc3v0.0.5rc3
- Updated Finnish translation (Submitted by Rolf Ahrenberg). - Added quickepgsearch, sport and music plugins in main menu logos (Submitted by zulu @vdr-portal.de). - Reworked debug() and error(). - Use required width of date for calculation of logo area with. - Don't let vector for text effects grow when moving through lists in menus. - Added internal translation of long weeksdays (Requested and translated by Pat @vdr-portal.de). - Support TrueTypeFonts again with VDR >=v1.5.4 (TTF width setup disabled). - Read OSD size from VDR's cOsd as suggested in VDR and Avards plugin. - Minor bugfixes and enhancements.
Diffstat (limited to 'logo.c')
-rw-r--r--logo.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/logo.c b/logo.c
index 48b1b4d..e8e17bc 100644
--- a/logo.c
+++ b/logo.c
@@ -33,7 +33,7 @@ cEnigmaLogoCache::~cEnigmaLogoCache()
bool cEnigmaLogoCache::Resize(unsigned int cacheSizeP)
{
- debug("cPluginSkinEnigma::Resize(%d)\n", cacheSizeP);
+ debug("cPluginSkinEnigma::Resize(%d)", cacheSizeP);
// flush cache only if it's smaller than before
if (cacheSizeP < cacheSizeM) {
Flush();
@@ -74,7 +74,7 @@ bool cEnigmaLogoCache::DrawImage(const char *fileNameP, int x, int y, int w, int
struct stat stbuf;
if (lstat(fileNameP, &stbuf) != 0) {
- error("cPluginSkinEnigma::LoadImage(%s) FILE NOT FOUND\n", fileNameP);
+ error("cPluginSkinEnigma::LoadImage(%s) FILE NOT FOUND", fileNameP);
bitmapM = NULL;
return false;
}
@@ -107,7 +107,7 @@ bool cEnigmaLogoCache::LoadChannelLogo(const cChannel *Channel)
strcpy(filename, "logos/");
strcat(filename, logoname);
if (!(fFoundLogo = Load(filename, ChannelLogoWidth, ChannelLogoHeight, false))) {
- error("cPluginSkinEnigma::LoadChannelLogo: LOGO \"%s.xpm\" NOT FOUND in %s/[hq]logos\n", logoname, EnigmaConfig.GetLogoDir());
+ error("cPluginSkinEnigma::LoadChannelLogo: LOGO \"%s.xpm\" NOT FOUND in %s/[hq]logos", logoname, EnigmaConfig.GetLogoDir());
fFoundLogo = Load("hqlogos/no_logo", ChannelLogoWidth, ChannelLogoHeight); //TODO? different default logo for channel/group?
}
}
@@ -137,15 +137,15 @@ bool cEnigmaLogoCache::Load(const char *fileNameP, int w, int h, bool fLogNotFou
if (strFilename == NULL)
return false;
- debug("cPluginSkinEnigma::Load(%s)\n", strFilename);
+ debug("cPluginSkinEnigma::Load(%s)", strFilename);
// does the logo exist already in map
std::map < std::string, cBitmap * >::iterator i = cacheMapM.find(strFilename);
if (i != cacheMapM.end()) {
// yes - cache hit!
- debug("cPluginSkinEnigma::Load() CACHE HIT!\n");
+ debug("cPluginSkinEnigma::Load() CACHE HIT!");
// check if logo really exist
if (i->second == NULL) {
- debug("cPluginSkinEnigma::Load() EMPTY\n");
+ debug("cPluginSkinEnigma::Load() EMPTY");
// empty logo in cache
free(strFilename);
return false;
@@ -153,7 +153,7 @@ bool cEnigmaLogoCache::Load(const char *fileNameP, int w, int h, bool fLogNotFou
bitmapM = i->second;
} else {
// no - cache miss!
- debug("cPluginSkinEnigma::Load() CACHE MISS!\n");
+ debug("cPluginSkinEnigma::Load() CACHE MISS!");
// try to load xpm logo
if (!LoadXpm(strFilename, w, h, fLogNotFound))
return false;
@@ -162,7 +162,7 @@ bool cEnigmaLogoCache::Load(const char *fileNameP, int w, int h, bool fLogNotFou
// update map
if (cacheMapM.size() >= cacheSizeM) {
// cache full - remove first
- debug("cPluginSkinEnigma::Load() DELETE\n");
+ debug("cPluginSkinEnigma::Load() DELETE");
if (cacheMapM.begin()->second != NULL) {
// logo exists - delete it
cBitmap *bmp = cacheMapM.begin()->second;
@@ -172,12 +172,12 @@ bool cEnigmaLogoCache::Load(const char *fileNameP, int w, int h, bool fLogNotFou
cacheMapM.erase(cacheMapM.begin());
}
// insert logo into map
- debug("cPluginSkinEnigma::Load() INSERT(%s)\n", strFilename);
+ debug("cPluginSkinEnigma::Load() INSERT(%s)", strFilename);
cacheMapM.insert(std::make_pair(strFilename, bitmapM));
}
// check if logo really exist
if (bitmapM == NULL) {
- debug("cPluginSkinEnigma::Load() EMPTY\n");
+ debug("cPluginSkinEnigma::Load() EMPTY");
// empty logo in cache
free(strFilename);
return false;
@@ -201,22 +201,22 @@ bool cEnigmaLogoCache::LoadXpm(const char *fileNameP, int w, int h, bool fLogNot
cBitmap *bmp = new cBitmap(1, 1, 1);
// create absolute filename
- debug("cPluginSkinEnigma::LoadXpm(%s)\n", fileNameP);
+ debug("cPluginSkinEnigma::LoadXpm(%s)", fileNameP);
// check validity
if ((lstat(fileNameP, &stbuf) == 0) && bmp->LoadXpm(fileNameP)) {
if ((bmp->Width() <= w) && (bmp->Height() <= h)) {
- debug("cPluginSkinEnigma::LoadXpm(%s) LOGO FOUND\n", fileNameP);
+ debug("cPluginSkinEnigma::LoadXpm(%s) LOGO FOUND", fileNameP);
// assign bitmap
bitmapM = bmp;
return true;
} else {
// wrong size
- error("cPluginSkinEnigma::LoadXpm(%s) LOGO HAS WRONG SIZE %d/%d (%d/%d)\n", fileNameP, bmp->Width(), bmp->Height(), w, h);
+ error("cPluginSkinEnigma::LoadXpm(%s) LOGO HAS WRONG SIZE %d/%d (%d/%d)", fileNameP, bmp->Width(), bmp->Height(), w, h);
}
} else {
// no xpm logo found
if (fLogNotFound)
- error("cPluginSkinEnigma::LoadXpm(%s) LOGO NOT FOUND\n", fileNameP);
+ error("cPluginSkinEnigma::LoadXpm(%s) LOGO NOT FOUND", fileNameP);
}
delete bmp;
@@ -226,10 +226,10 @@ bool cEnigmaLogoCache::LoadXpm(const char *fileNameP, int w, int h, bool fLogNot
bool cEnigmaLogoCache::Flush(void)
{
- debug("cPluginSkinEnigma::Flush()\n");
+ debug("cPluginSkinEnigma::Flush()");
// check if map is empty
if (!cacheMapM.empty()) {
- debug("cPluginSkinEnigma::Flush() NON-EMPTY\n");
+ debug("cPluginSkinEnigma::Flush() NON-EMPTY");
// delete bitmaps and clear map
for (std::map<std::string, cBitmap *>::iterator i = cacheMapM.begin(); i != cacheMapM.end(); i++) {
delete((*i).second);