summaryrefslogtreecommitdiff
path: root/logo.c
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2010-04-05 12:31:58 +0200
committerAndreas Mair <amair.sob@googlemail.com>2010-04-05 12:31:58 +0200
commiteebfdf1a3d737db58e6d2d3c6945584dd5e5054f (patch)
tree6a28dcd5ab8c85a14a8957f221d8ef0a5680a7fc /logo.c
parent95977e11c0a5c1170351f2fafe400519d7b1086b (diff)
downloadvdr-plugin-skinenigmang-0.1.1.tar.gz
vdr-plugin-skinenigmang-0.1.1.tar.bz2
2010-04-05: Version 0.1.1v0.1.1
- Moved "General / Show progressbar" to "Logos & Symbols / Show progressbar in lists". - Fixed gcc 4.3 compiler warnings. - Show "Parental Rating" and "Contents" in EPG and recording details (requires at least VDR 1.7.11). - Show estimated bitrate and recording format (TS/PES) in recording's details. - Show subtitle tracks in EPG and recording details. - Changed defaults for setup options. - Don't define CLEAR_BUG_WORKAROUND by default. - Added new setup option "Colored status symbols in EPG details". - Added new theme "bgw" (Submitted by jlacvdr @gmail.com). - Added new setup option "Round corners". - Display cut length and size of recordings in recording's details (based on skinelchi-0.2.1). - Fixed calculation of channel info OSD areas. - Check for valid OSD width and height and font size and width. - Added VDR's default fonts to the TrueTypeFont selector. - Unselectable rows in menu OSD starting with "---" will be formated as headlines if "Show symbols in lists" is set. - New "elapsed/remaining" option for "Show remaining/elapsed time" setting. - New "active only" option for "Show status symbols" setting. - Added setup option for minimal info area width. - Restructured setup menu.
Diffstat (limited to 'logo.c')
-rw-r--r--logo.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/logo.c b/logo.c
index 8ff2b26..54a6db5 100644
--- a/logo.c
+++ b/logo.c
@@ -49,9 +49,11 @@ bool cEnigmaLogoCache::DrawEventImage(const cEvent *Event, int x, int y, int w,
return false;
char *strFilename = NULL;
- asprintf(&strFilename, "%s/%d.%s", EnigmaConfig.GetImagesDir(), Event->EventID(), EnigmaConfig.GetImageExtension());
- int rc = DrawImage(strFilename, x, y, w, h, c, bmp);
- free (strFilename);
+ int rc = false;
+ if (-1 != asprintf(&strFilename, "%s/%d.%s", EnigmaConfig.GetImagesDir(), Event->EventID(), EnigmaConfig.GetImageExtension())) {
+ rc = DrawImage(strFilename, x, y, w, h, c, bmp);
+ free (strFilename);
+ }
return rc;
}
@@ -61,9 +63,11 @@ bool cEnigmaLogoCache::DrawRecordingImage(const cRecording *Recording, int x, in
return false;
char *strFilename = NULL;
- asprintf(&strFilename, "%s/%s.%s", Recording->FileName(), RECORDING_COVER, EnigmaConfig.GetImageExtension());
- int rc = DrawImage(strFilename, x, y, w, h, c, bmp);
- free (strFilename);
+ int rc = false;
+ if (-1 != asprintf(&strFilename, "%s/%s.%s", Recording->FileName(), RECORDING_COVER, EnigmaConfig.GetImageExtension())) {
+ rc = DrawImage(strFilename, x, y, w, h, c, bmp);
+ free (strFilename);
+ }
return rc;
}
@@ -144,9 +148,8 @@ bool cEnigmaLogoCache::Load(const char *fileNameP, int w, int h, bool fLogNotFou
if (fileNameP == NULL)
return false;
- char *strFilename;
- asprintf(&strFilename, "%s/%s.xpm", EnigmaConfig.GetLogoDir(), fileNameP);
- if (strFilename == NULL)
+ char *strFilename = NULL;
+ if (-1 == asprintf(&strFilename, "%s/%s.xpm", EnigmaConfig.GetLogoDir(), fileNameP))
return false;
debug("cPluginSkinEnigma::Load(%s)", strFilename);