Added Cache for images and fonts

1 files changed, 23 insertions, 30 deletions

diff --git a/skinnopacity.c b/skinnopacity.c
index 40475f5..602029b 100644
--- a/skinnopacity.c
+++ b/skinnopacity.c
@@ -15,13 +15,14 @@
 #endif
 
 
-static const char *VERSION        = "0.1.4";
+static const char *VERSION        = "0.1.4 dev";
 static const char *DESCRIPTION    = "'nOpacity' Skin";
 static const char *MAINMENUENTRY  = "nOpacity";
 
 class cPluginNopacity : public cPlugin {
 private:
   cNopacity *nopacity;
+  cImageCache *imgCache;
 public:
   cPluginNopacity(void);
   virtual ~cPluginNopacity();
@@ -62,8 +63,7 @@ const char *cPluginNopacity::CommandLineHelp(void)
          "  -l <LOGOPATH>, --logopath=<LOGOPATH>       Set directory where Channel Logos are stored.\n";
 }
 
-bool cPluginNopacity::ProcessArgs(int argc, char *argv[])
-{
+bool cPluginNopacity::ProcessArgs(int argc, char *argv[]) {
   // Implement command line argument processing here if applicable.
   static const struct option long_options[] = {
     { "epgimages", required_argument, NULL, 'e' },
@@ -91,66 +91,59 @@ bool cPluginNopacity::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
-bool cPluginNopacity::Initialize(void)
-{
+bool cPluginNopacity::Initialize(void) {
   return true;
 }
 
-bool cPluginNopacity::Start(void)
-{
+bool cPluginNopacity::Start(void) {
     if (!cOsdProvider::SupportsTrueColor()) {
         esyslog("nopacity: No TrueColor OSD found! Aborting!");
         return false;
     } else
         dsyslog("nopacity: TrueColor OSD found");
-  nopacity = new cNopacity;
-  return nopacity;
+    
+    imgCache = new cImageCache();
+    nopacity = new cNopacity(imgCache);
+    return nopacity;
 }
 
-void cPluginNopacity::Stop(void)
-{
+void cPluginNopacity::Stop(void) {
+    delete imgCache;
+    delete geoManager;
+    delete fontManager;
 }
 
-void cPluginNopacity::Housekeeping(void)
-{
+void cPluginNopacity::Housekeeping(void) {
 }
 
-void cPluginNopacity::MainThreadHook(void)
-{
+void cPluginNopacity::MainThreadHook(void) {
 }
 
-cString cPluginNopacity::Active(void)
-{
+cString cPluginNopacity::Active(void) {
   return NULL;
 }
 
-time_t cPluginNopacity::WakeupTime(void)
-{
+time_t cPluginNopacity::WakeupTime(void) {
   return 0;
 }
 
-cOsdObject *cPluginNopacity::MainMenuAction(void)
-{
+cOsdObject *cPluginNopacity::MainMenuAction(void) {
   return NULL;
 }
 
-cMenuSetupPage *cPluginNopacity::SetupMenu(void)
-{
-  return new cNopacitySetup();
+cMenuSetupPage *cPluginNopacity::SetupMenu(void) {
+  return new cNopacitySetup(imgCache);
 }
 
-bool cPluginNopacity::SetupParse(const char *Name, const char *Value)
-{
+bool cPluginNopacity::SetupParse(const char *Name, const char *Value) {
   return config.SetupParse(Name, Value);
 }
 
-bool cPluginNopacity::Service(const char *Id, void *Data)
-{
+bool cPluginNopacity::Service(const char *Id, void *Data) {
   return false;
 }
 
-const char **cPluginNopacity::SVDRPHelpPages(void)
-{
+const char **cPluginNopacity::SVDRPHelpPages(void) {
     static const char *HelpPages[] = {
         "NEXTMESG\n"
 	"    Switches to next message in running RSS Feed\n",