1 files changed, 19 insertions, 16 deletions

diff --git a/logo.h b/logo.h
index a58727a..24968c6 100644
--- a/logo.h
+++ b/logo.h
@@ -1,5 +1,5 @@
 /*
- * logo.h: The 'EnigmaNG' VDR skin
+ * logo.h: 'EnigmaNG' skin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -8,17 +8,18 @@
 #ifndef __SKINENIGMA_LOGO_H
 #define __SKINENIGMA_LOGO_H
 
+#include "common.h"
+
+#ifdef HAVE_IMAGEMAGICK
+#include "bitmap.h"
+#endif
+
 #include <map>
-#include <string>
 #include <vdr/channels.h>
 #include <vdr/epg.h>
 #include <vdr/recording.h>
 #include <vdr/osd.h>
 
-#ifdef HAVE_IMAGEMAGICK
-#include "bitmap.h"
-#endif
-
 // size of channel logos
 #define ChannelLogoWidth  80
 #define ChannelLogoHeight 80
@@ -31,26 +32,26 @@
 
 class cEnigmaLogoCache {
 private:
-	bool fImageRequested;
+  bool fImageRequested;
   unsigned int cacheSizeM;
   cBitmap *bitmapM;
 #ifdef HAVE_IMAGEMAGICK
-	cOSDImageBitmap image;
-	cBitmap *bmpImage;
+  cOSDImageBitmap image;
+  cBitmap *bmpImage;
 #endif
   std::map<std::string, cBitmap*> cacheMapM;
-  bool LoadImage(const char *fileNameP, int w, int h, int c);
+  bool DrawImage(const char *fileNameP, int x, int y, int w, int h, int c, cBitmap *bmp);
   bool LoadXpm(const char *fileNameP, int w, int h);
-	bool Load(const char *fileNameP, int w, int h);
+  bool Load(const char *fileNameP, int w, int h);
 public:
   cEnigmaLogoCache(unsigned int cacheSizeP);
   ~cEnigmaLogoCache();
   bool Resize(unsigned int cacheSizeP);
-	bool LoadEventImage(const cEvent *Event, int w, int h, int c);
-	bool LoadRecordingImage(const cRecording *Recording, int w, int h, int c);
-	bool LoadChannelLogo(const cChannel *Channel);
-	bool LoadSymbol(const char *fileNameP);
-	bool LoadIcon(const char *fileNameP);
+  bool DrawEventImage(const cEvent *Event, int x, int y, int w, int h, int c, cBitmap *bmp);
+  bool DrawRecordingImage(const cRecording *Recording, int x, int y, int w, int h, int c, cBitmap *bmp);
+  bool LoadChannelLogo(const cChannel *Channel);
+  bool LoadSymbol(const char *fileNameP);
+  bool LoadIcon(const char *fileNameP);
   cBitmap& Get(void);
   bool Flush(void);
 };
@@ -58,3 +59,5 @@ public:
 extern cEnigmaLogoCache EnigmaLogoCache;
 
 #endif // __SKINENIGMA_LOGO_H
+
+// vim:et:sw=2:ts=2: