summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--detailview.c11
-rw-r--r--detailview.h13
-rw-r--r--displaychannel.c4
-rw-r--r--displaychannel.h2
-rw-r--r--displaychannelview.c5
-rw-r--r--displaychannelview.h5
-rw-r--r--displaymenu.c25
-rw-r--r--displaymenu.h7
-rw-r--r--displaymenuview.c9
-rw-r--r--displaymenuview.h4
-rw-r--r--displaymessage.c5
-rw-r--r--displaymessage.h5
-rw-r--r--displayreplay.c5
-rw-r--r--displayreplay.h5
-rw-r--r--displaytracks.c5
-rw-r--r--displaytracks.h3
-rw-r--r--displayvolume.c3
-rw-r--r--displayvolume.h7
-rw-r--r--imagecache.c2
-rw-r--r--imagecache.h2
-rw-r--r--menudetailview.c21
-rw-r--r--menudetailview.h5
-rw-r--r--menuitem.c19
-rw-r--r--menuitem.h17
-rw-r--r--messagebox.c2
-rw-r--r--messagebox.h2
-rw-r--r--nopacity.c17
-rw-r--r--nopacity.h3
-rw-r--r--setup.c10
-rw-r--r--setup.h9
-rw-r--r--skinnopacity.c7
-rw-r--r--timers.c8
-rw-r--r--timers.h5
33 files changed, 114 insertions, 138 deletions
diff --git a/detailview.c b/detailview.c
index 96d4151..6d869a0 100644
--- a/detailview.c
+++ b/detailview.c
@@ -4,9 +4,8 @@
* cNopacityView
********************************************************************************************/
-cNopacityView::cNopacityView(cOsd *osd, cImageCache *imgCache) {
+cNopacityView::cNopacityView(cOsd *osd) {
this->osd = osd;
- this->imgCache = imgCache;
activeView = 0;
scrollable = false;
tabbed = false;
@@ -411,7 +410,7 @@ bool cNopacityView::KeyDown(void) {
* cNopacityEPGView : cNopacityView
********************************************************************************************/
-cNopacityEPGView::cNopacityEPGView(cOsd *osd, cImageCache *imgCache) : cNopacityView(osd, imgCache) {
+cNopacityEPGView::cNopacityEPGView(cOsd *osd) : cNopacityView(osd) {
tabbed = true;
pixmapHeaderEPGImage = NULL;
numEPGPics = -1;
@@ -592,7 +591,7 @@ void cNopacityEPGView::Action(void) {
* cNopacitySeriesView : cNopacityView
********************************************************************************************/
-cNopacitySeriesView::cNopacitySeriesView(cOsd *osd, cImageCache *imgCache, int seriesId, int episodeId) : cNopacityView(osd, imgCache) {
+cNopacitySeriesView::cNopacitySeriesView(cOsd *osd, int seriesId, int episodeId) : cNopacityView(osd) {
this->seriesId = seriesId;
this->episodeId = episodeId;
tvdbInfo = "";
@@ -854,7 +853,7 @@ void cNopacitySeriesView::Action(void) {
* cNopacityMovieView : cNopacityView
********************************************************************************************/
-cNopacityMovieView::cNopacityMovieView(cOsd *osd, cImageCache *imgCache, int movieId) : cNopacityView(osd, imgCache) {
+cNopacityMovieView::cNopacityMovieView(cOsd *osd, int movieId) : cNopacityView(osd) {
this->movieId = movieId;
pixmapHeaderPoster = NULL;
tabbed = true;
@@ -1085,7 +1084,7 @@ void cNopacityMovieView::Action(void) {
* cNopacityTextView : cNopacityView
********************************************************************************************/
-cNopacityTextView::cNopacityTextView(cOsd *osd, cImageCache *imgCache) : cNopacityView(osd, imgCache) {
+cNopacityTextView::cNopacityTextView(cOsd *osd) : cNopacityView(osd) {
}
cNopacityTextView::~cNopacityTextView(void) {
diff --git a/detailview.h b/detailview.h
index 0a908bd..ab25f6c 100644
--- a/detailview.h
+++ b/detailview.h
@@ -31,7 +31,6 @@ enum eMediaViewTabs {
class cNopacityView : public cThread {
protected:
cOsd *osd;
- cImageCache *imgCache;
cPixmap *pixmapHeader;
cPixmap *pixmapHeaderLogo;
cPixmap *pixmapContent;
@@ -68,7 +67,7 @@ protected:
virtual void SetTabs(void) {};
void DrawTabs(void);
public:
- cNopacityView(cOsd *osd, cImageCache *imgCache);
+ cNopacityView(cOsd *osd);
virtual ~cNopacityView(void);
void SetTitle(const char *t) { title = t ? t : ""; };
void SetSubTitle(const char *s) { subTitle = s ? s : ""; };
@@ -101,7 +100,7 @@ protected:
void CheckEPGImages(void);
void DrawImages(void);
public:
- cNopacityEPGView(cOsd *osd, cImageCache *imgCache);
+ cNopacityEPGView(cOsd *osd);
virtual ~cNopacityEPGView(void);
void KeyLeft(void);
void KeyRight(void);
@@ -121,7 +120,7 @@ protected:
void DrawImages(void);
int GetRandomPoster(void);
public:
- cNopacitySeriesView(cOsd *osd, cImageCache *imgCache, int seriesId, int episodeId);
+ cNopacitySeriesView(cOsd *osd, int seriesId, int episodeId);
virtual ~cNopacitySeriesView(void);
void LoadMedia(void);
void KeyLeft(void);
@@ -140,7 +139,7 @@ protected:
void DrawHeaderPoster(void);
void DrawImages(void);
public:
- cNopacityMovieView(cOsd *osd, cImageCache *imgCache, int movieId);
+ cNopacityMovieView(cOsd *osd, int movieId);
virtual ~cNopacityMovieView(void);
void LoadMedia(void);
void KeyLeft(void);
@@ -151,11 +150,11 @@ public:
class cNopacityTextView : public cNopacityView {
protected:
public:
- cNopacityTextView(cOsd *osd, cImageCache *imgCache);
+ cNopacityTextView(cOsd *osd);
virtual ~cNopacityTextView(void);
void KeyLeft(void);
void KeyRight(void);
void Action(void);
};
-#endif //__NOPACITY_DETAILVIEW_H \ No newline at end of file
+#endif //__NOPACITY_DETAILVIEW_H
diff --git a/displaychannel.c b/displaychannel.c
index 6a101d8..7c65466 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -7,7 +7,7 @@
#include <vdr/osd.h>
#include <vdr/menu.h>
-cNopacityDisplayChannel::cNopacityDisplayChannel(cImageCache *imgCache, bool WithInfo) {
+cNopacityDisplayChannel::cNopacityDisplayChannel(bool WithInfo) {
groupSep = false;
present = NULL;
following = NULL;
@@ -17,7 +17,7 @@ cNopacityDisplayChannel::cNopacityDisplayChannel(cImageCache *imgCache, bool Wit
FadeTime = config.GetValue("channelFadeTime");
FrameTime = FadeTime / 10;
- channelView = new cNopacityDisplayChannelView(imgCache);
+ channelView = new cNopacityDisplayChannelView();
channelView->createOsd();
channelView->CreatePixmaps();
channelView->DrawBackground();
diff --git a/displaychannel.h b/displaychannel.h
index 6a76eee..98ea0a8 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -23,7 +23,7 @@ private:
virtual void Action(void);
void SetProgressBar(const cEvent *present);
public:
- cNopacityDisplayChannel(cImageCache *imgCache, bool WithInfo);
+ cNopacityDisplayChannel(bool WithInfo);
virtual ~cNopacityDisplayChannel();
virtual void SetChannel(const cChannel *Channel, int Number);
virtual void SetEvents(const cEvent *Present, const cEvent *Following);
diff --git a/displaychannelview.c b/displaychannelview.c
index 0d24c21..503c518 100644
--- a/displaychannelview.c
+++ b/displaychannelview.c
@@ -7,8 +7,7 @@
#include "imageloader.h"
#include <vdr/menu.h>
-cNopacityDisplayChannelView::cNopacityDisplayChannelView(cImageCache *imgCache) {
- this->imgCache = imgCache;
+cNopacityDisplayChannelView::cNopacityDisplayChannelView(void) {
osd = NULL;
lastDate = "";
isRadioChannel = false;
@@ -862,7 +861,7 @@ void cNopacityDisplayChannelView::DisplayMessage(eMessageType Type, const char *
DELETENULL(messageBox);
if (!Text)
return;
- messageBox = new cNopacityMessageBox(osd, imgCache,
+ messageBox = new cNopacityMessageBox(osd,
cRect((geoManager->channelWidth - geoManager->messageWidth) / 2,
geoManager->channelTop + geoManager->channelHeight - geoManager->messageHeight - 20,
geoManager->messageWidth, geoManager->messageHeight),
diff --git a/displaychannelview.h b/displaychannelview.h
index 076270b..f4c4935 100644
--- a/displaychannelview.h
+++ b/displaychannelview.h
@@ -7,7 +7,6 @@
class cNopacityDisplayChannelView {
private:
- cImageCache *imgCache;
cOsd *osd;
cString lastDate;
int statusIconBorder;
@@ -38,8 +37,8 @@ private:
cString GetScreenResolutionIcon(void);
std::string GetChannelSep(const cChannel *channel, bool prev);
public:
- cNopacityDisplayChannelView(cImageCache *imgCache);
- virtual ~cNopacityDisplayChannelView();
+ cNopacityDisplayChannelView(void);
+ virtual ~cNopacityDisplayChannelView(void);
bool createOsd(void);
void CreatePixmaps(void);
void SetAlpha(int alpha);
diff --git a/displaymenu.c b/displaymenu.c
index 4ea103f..86045f6 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -11,8 +11,7 @@ namespace PluginRemoteTimers {
#include <string>
#include "services/epgsearch.h"
-cNopacityDisplayMenu::cNopacityDisplayMenu(cImageCache *imgCache) {
- this->imgCache = imgCache;
+cNopacityDisplayMenu::cNopacityDisplayMenu(void) {
menuCategoryLast = mcUndefined;
FadeTime = config.GetValue("menuFadeTime");
FrameTime = FadeTime / 10;
@@ -24,7 +23,7 @@ cNopacityDisplayMenu::cNopacityDisplayMenu(cImageCache *imgCache) {
currentNumItems = 0;
detailView = NULL;
SetButtonPositions();
- menuView = new cNopacityDisplayMenuView(imgCache);
+ menuView = new cNopacityDisplayMenuView();
osd = menuView->createOsd();
menuView->SetDescriptionTextWindowSize();
menuView->CreatePixmaps();
@@ -34,7 +33,7 @@ cNopacityDisplayMenu::cNopacityDisplayMenu(cImageCache *imgCache) {
SetTabs(0);
}
-cNopacityDisplayMenu::~cNopacityDisplayMenu() {
+cNopacityDisplayMenu::~cNopacityDisplayMenu(void) {
Cancel(-1);
while (Active())
cCondWait::SleepMs(10);
@@ -364,7 +363,7 @@ bool cNopacityDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Cur
if ((int)menuItems.size() <= Index)
menuItems.resize(currentNumItems);
if (!menuItems[Index]) {
- cNopacityMenuItem *item = new cNopacityScheduleMenuItem(osd, imgCache, Event, Channel, TimerMatch, Selectable, MenuCategory(), &videoWindowRect);
+ cNopacityMenuItem *item = new cNopacityScheduleMenuItem(osd, Event, Channel, TimerMatch, Selectable, MenuCategory(), &videoWindowRect);
cPoint itemSize;
menuItems[Index].reset(item);
menuView->GetMenuItemSize(MenuCategory(), &itemSize);
@@ -406,7 +405,7 @@ bool cNopacityDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Cur
if ((int)menuItems.size() <= Index)
menuItems.resize(currentNumItems);
if (!menuItems[Index]) {
- cNopacityMenuItem *item = new cNopacityTimerMenuItem(osd, imgCache, Timer, Selectable, &videoWindowRect);
+ cNopacityMenuItem *item = new cNopacityTimerMenuItem(osd, Timer, Selectable, &videoWindowRect);
cPoint itemSize;
menuItems[Index].reset(item);
menuView->GetMenuItemSize(MenuCategory(), &itemSize);
@@ -448,7 +447,7 @@ bool cNopacityDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bo
if ((int)menuItems.size() <= Index)
menuItems.resize(currentNumItems);
if (!menuItems[Index]) {
- cNopacityMenuItem *item = new cNopacityChannelMenuItem(osd, imgCache, Channel, Selectable, &videoWindowRect);
+ cNopacityMenuItem *item = new cNopacityChannelMenuItem(osd, Channel, Selectable, &videoWindowRect);
cPoint itemSize;
menuItems[Index].reset(item);
menuView->GetMenuItemSize(MenuCategory(), &itemSize);
@@ -493,7 +492,7 @@ bool cNopacityDisplayMenu::SetItemRecording(const cRecording *Recording, int Ind
bool isFolder = false;
if (Total > 0)
isFolder = true;
- cNopacityMenuItem *item = new cNopacityRecordingMenuItem(osd, imgCache, Recording, Selectable, isFolder, Level, Total, New, &videoWindowRect);
+ cNopacityMenuItem *item = new cNopacityRecordingMenuItem(osd, Recording, Selectable, isFolder, Level, Total, New, &videoWindowRect);
cPoint itemSize;
menuItems[Index].reset(item);
menuView->GetMenuItemSize(MenuCategory(), &itemSize);
@@ -551,14 +550,14 @@ void cNopacityDisplayMenu::SetItem(const char *Text, int Index, bool Current, bo
if (((MenuCategory() == mcMain)&&(config.GetValue("narrowMainMenu"))) || ((MenuCategory() == mcSetup)&&(config.GetValue("narrowSetupMenu")))){
MainOrSetup = true;
bool isSetup = (MenuCategory() == mcSetup)?true:false;
- item = new cNopacityMainMenuItem(osd, imgCache, Text, Selectable, isSetup);
+ item = new cNopacityMainMenuItem(osd, Text, Selectable, isSetup);
menuItems[Index].reset(item);
menuView->GetMenuItemSize(MenuCategory(), &itemSize);
item->SetFont(fontManager->menuItemLarge);
if (config.GetValue("useMenuIcons"))
hasIcons = true;
} else {
- item = new cNopacityDefaultMenuItem(osd, imgCache, Text, Selectable);
+ item = new cNopacityDefaultMenuItem(osd, Text, Selectable);
menuItems[Index].reset(item);
menuView->GetMenuItemSize(mcUnknown, &itemSize);
item->SetFont(fontManager->menuItemDefault);
@@ -648,7 +647,7 @@ void cNopacityDisplayMenu::SetEvent(const cEvent *Event) {
if (!Event)
return;
menuView->AdjustContentBackground(this->MenuCategory(), menuCategoryLast, videoWindowRect);
- detailView = new cNopacityDetailView(dvEvent, osd, imgCache);
+ detailView = new cNopacityDetailView(dvEvent, osd);
menuView->SetDetailViewSize(dvEvent, detailView);
detailView->SetEvent(Event);
detailView->Start();
@@ -662,7 +661,7 @@ void cNopacityDisplayMenu::SetRecording(const cRecording *Recording) {
return;
}
menuView->AdjustContentBackground(this->MenuCategory(), menuCategoryLast, videoWindowRect);
- detailView = new cNopacityDetailView(dvRecording, osd, imgCache);
+ detailView = new cNopacityDetailView(dvRecording, osd);
menuView->SetDetailViewSize(dvRecording, detailView);
detailView->SetRecording(Recording);
detailView->Start();
@@ -672,7 +671,7 @@ void cNopacityDisplayMenu::SetText(const char *Text, bool FixedFont) {
if (!Text)
return;
menuView->AdjustContentBackground(this->MenuCategory(), menuCategoryLast, videoWindowRect);
- detailView = new cNopacityDetailView(dvText, osd, imgCache);
+ detailView = new cNopacityDetailView(dvText, osd);
menuView->SetDetailViewSize(dvText, detailView);
detailView->SetText(Text);
detailView->Start();
diff --git a/displaymenu.h b/displaymenu.h
index e08b6f0..4ae59bf 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -3,13 +3,14 @@
#include "nopacity.h"
#include "menuitem.h"
+#include "imagecache.h"
+
#include <vdr/thread.h>
#include <memory>
#include <vector>
class cNopacityDisplayMenu : public cSkinDisplayMenu , cThread {
private:
- cImageCache *imgCache;
cNopacityDisplayMenuView *menuView;
cNopacityDetailView *detailView;
cOsd *osd;
@@ -40,8 +41,8 @@ public:
#ifdef DEPRECATED_SKIN_SETITEMEVENT
using cSkinDisplayMenu::SetItemEvent;
#endif
- cNopacityDisplayMenu(cImageCache *imgCache);
- virtual ~cNopacityDisplayMenu();
+ cNopacityDisplayMenu(void);
+ virtual ~cNopacityDisplayMenu(void);
virtual void Scroll(bool Up, bool Page);
virtual int MaxItems(void);
virtual void Clear(void);
diff --git a/displaymenuview.c b/displaymenuview.c
index cdcdddd..e4e34b6 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -1,7 +1,6 @@
#include "displaymenuview.h"
-cNopacityDisplayMenuView::cNopacityDisplayMenuView(cImageCache *imgCache) {
- this->imgCache = imgCache;
+cNopacityDisplayMenuView::cNopacityDisplayMenuView(void) {
diskUsageAlert = 95;
pixmapHeaderIcon = NULL;
messageBox = NULL;
@@ -625,7 +624,7 @@ int cNopacityDisplayMenuView::GetTimersMaxHeight(void) {
}
cNopacityTimer *cNopacityDisplayMenuView::DrawTimerConflict(int numConflicts, int y) {
- cNopacityTimer *t = new cNopacityTimer(osd, imgCache, numConflicts, fontManager->menuTimers, fontManager->menuTimersHead);
+ cNopacityTimer *t = new cNopacityTimer(osd, numConflicts, fontManager->menuTimers, fontManager->menuTimersHead);
t->SetGeometry(geoManager->menuTimersWidth, y);
t->CreateConflictText();
t->CalculateHeight(geoManager->menuSpace);
@@ -636,7 +635,7 @@ cNopacityTimer *cNopacityDisplayMenuView::DrawTimerConflict(int numConflicts, in
}
cNopacityTimer *cNopacityDisplayMenuView::DrawTimer(const cTimer *Timer, int y) {
- cNopacityTimer *t = new cNopacityTimer(osd, imgCache, Timer, fontManager->menuTimers, fontManager->menuTimersHead);
+ cNopacityTimer *t = new cNopacityTimer(osd, Timer, fontManager->menuTimers, fontManager->menuTimersHead);
t->SetGeometry(geoManager->menuTimersWidth, y);
t->CreateDate();
t->CreateShowName();
@@ -673,7 +672,7 @@ void cNopacityDisplayMenuView::DrawMessage(eMessageType Type, const char *Text)
DELETENULL(messageBox);
if (!Text)
return;
- messageBox = new cNopacityMessageBox(osd, imgCache,
+ messageBox = new cNopacityMessageBox(osd,
cRect((geoManager->osdWidth - geoManager->messageWidth) / 2,
geoManager->osdHeight * 9/10 - geoManager->messageHeight,
geoManager->messageWidth, geoManager->messageHeight),
diff --git a/displaymenuview.h b/displaymenuview.h
index 0899828..0caa00c 100644
--- a/displaymenuview.h
+++ b/displaymenuview.h
@@ -7,13 +7,13 @@
#include <vdr/videodir.h>
#include "config.h"
#include "helpers.h"
+#include "imagecache.h"
#include "imageloader.h"
#include "messagebox.h"
class cNopacityDisplayMenuView {
private:
cOsd *osd;
- cImageCache *imgCache;
cString lastDate;
int diskUsageAlert;
cPixmap *pixmapHeader;
@@ -39,7 +39,7 @@ class cNopacityDisplayMenuView {
cRect textWindowSizeTimers;
int GetContentWidth(eMenuCategory menuCat);
public:
- cNopacityDisplayMenuView(cImageCache *imgCache);
+ cNopacityDisplayMenuView(void);
virtual ~cNopacityDisplayMenuView(void);
cOsd *createOsd(void);
void SetDescriptionTextWindowSize(void);
diff --git a/displaymessage.c b/displaymessage.c
index 77a3bd0..92753f0 100644
--- a/displaymessage.c
+++ b/displaymessage.c
@@ -3,8 +3,7 @@
#include "imageloader.h"
#include "helpers.h"
-cNopacityDisplayMessage::cNopacityDisplayMessage(cImageCache *imgCache) {
- this->imgCache = imgCache;
+cNopacityDisplayMessage::cNopacityDisplayMessage(void) {
FadeTime = config.GetValue("messageFadeTime");
FrameTime = FadeTime / 10;
int top = geoManager->osdTop + geoManager->osdHeight - geoManager->messageHeight - config.GetValue("messageBorderBottom");
@@ -23,7 +22,7 @@ cNopacityDisplayMessage::~cNopacityDisplayMessage() {
void cNopacityDisplayMessage::SetMessage(eMessageType Type, const char *Text) {
delete messageBox;
- messageBox = new cNopacityMessageBox(osd, imgCache, cRect(0, 0, geoManager->messageWidth, geoManager->messageHeight), Type, Text);
+ messageBox = new cNopacityMessageBox(osd, cRect(0, 0, geoManager->messageWidth, geoManager->messageHeight), Type, Text);
if (FadeTime) {
messageBox->SetAlpha(0);
Start();
diff --git a/displaymessage.h b/displaymessage.h
index e89d4fb..c3fc13c 100644
--- a/displaymessage.h
+++ b/displaymessage.h
@@ -9,14 +9,13 @@
class cNopacityDisplayMessage : public cSkinDisplayMessage , cThread {
private:
cOsd *osd;
- cImageCache *imgCache;
cNopacityMessageBox *messageBox;
int FrameTime;
int FadeTime;
virtual void Action(void);
public:
- cNopacityDisplayMessage(cImageCache *imgCache);
- virtual ~cNopacityDisplayMessage();
+ cNopacityDisplayMessage(void);
+ virtual ~cNopacityDisplayMessage(void);
virtual void SetMessage(eMessageType Type, const char *Text);
virtual void Flush(void);
};
diff --git a/displayreplay.c b/displayreplay.c
index 9cf0d29..6cfd7c7 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -3,8 +3,7 @@
#include "helpers.h"
#include "imageloader.h"
-cNopacityDisplayReplay::cNopacityDisplayReplay(cImageCache *imgCache, bool ModeOnly) {
- this->imgCache = imgCache;
+cNopacityDisplayReplay::cNopacityDisplayReplay(bool ModeOnly) {
initial = true;
modeOnly = ModeOnly;
lastDate = "";
@@ -468,7 +467,7 @@ void cNopacityDisplayReplay::SetMessage(eMessageType Type, const char *Text) {
DELETENULL(messageBox);
if (!Text)
return;
- messageBox = new cNopacityMessageBox(osd, imgCache,
+ messageBox = new cNopacityMessageBox(osd,
cRect((geoManager->replayWidth - geoManager->messageWidth) / 2,
geoManager->replayHeight - geoManager->messageHeight - 20,
geoManager->messageWidth, geoManager->messageHeight),
diff --git a/displayreplay.h b/displayreplay.h
index 2d160c6..bbedabf 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -9,7 +9,6 @@
class cNopacityDisplayReplay : public cSkinDisplayReplay , cThread{
private:
cOsd *osd;
- cImageCache *imgCache;
bool initial;
bool modeOnly;
cString lastDate;
@@ -40,8 +39,8 @@ private:
void LoadControlIcons(void);
void DrawScreenResolution(void);
public:
- cNopacityDisplayReplay(cImageCache *imgCache, bool ModeOnly);
- virtual ~cNopacityDisplayReplay();
+ cNopacityDisplayReplay(bool ModeOnly);
+ virtual ~cNopacityDisplayReplay(void);
virtual void SetRecording(const cRecording *Recording);
virtual void SetTitle(const char *Title);
virtual void SetMode(bool Play, bool Forward, int Speed);
diff --git a/displaytracks.c b/displaytracks.c
index 536e85b..afc5def 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -4,8 +4,7 @@
#include "imageloader.h"
-cNopacityDisplayTracks::cNopacityDisplayTracks(cImageCache *imgCache, const char *Title, int NumTracks, const char * const *Tracks) {
- this->imgCache = imgCache;
+cNopacityDisplayTracks::cNopacityDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks) {
initial = true;
currentIndex = -1;
numTracks = NumTracks;
@@ -117,7 +116,7 @@ void cNopacityDisplayTracks::DrawHeader(const char *Title) {
void cNopacityDisplayTracks::SetItem(const char *Text, int Index, bool Current) {
cNopacityMenuItem *item;
- item = new cNopacityTrackMenuItem(osd, imgCache, Text);
+ item = new cNopacityTrackMenuItem(osd, Text);
if ((int)menuItems.size() <= Index)
menuItems.resize(Index+4);
menuItems[Index].reset(item);
diff --git a/displaytracks.h b/displaytracks.h
index 0442b9a..8d1459f 100644
--- a/displaytracks.h
+++ b/displaytracks.h
@@ -10,7 +10,6 @@
class cNopacityDisplayTracks : public cSkinDisplayTracks, cThread {
private:
cOsd *osd;
- cImageCache *imgCache;
int FrameTime;
int FadeTime;
int width, height;
@@ -31,7 +30,7 @@ private:
void CreatePixmaps(void);
void DrawHeader(const char *Title);
public:
- cNopacityDisplayTracks(cImageCache *imgCache, const char *Title, int NumTracks, const char * const *Tracks);
+ cNopacityDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
virtual ~cNopacityDisplayTracks();
virtual void SetTrack(int Index, const char * const *Tracks);
virtual void SetAudioChannel(int AudioChannel);
diff --git a/displayvolume.c b/displayvolume.c
index 7c1181a..06393e9 100644
--- a/displayvolume.c
+++ b/displayvolume.c
@@ -4,8 +4,7 @@
#include "config.h"
#include "helpers.h"
-cNopacityDisplayVolume::cNopacityDisplayVolume(cImageCache *imgCache) {
- this->imgCache = imgCache;
+cNopacityDisplayVolume::cNopacityDisplayVolume(void) {
initial = true;
muted = false;
FadeTime = config.GetValue("volumeFadeTime");
diff --git a/displayvolume.h b/displayvolume.h
index a3d66cc..bc4335b 100644
--- a/displayvolume.h
+++ b/displayvolume.h
@@ -12,7 +12,6 @@ private:
bool initial;
bool muted;
cOsd *osd;
- cImageCache *imgCache;
cPixmap *pixmapBackground;
cPixmap *pixmapProgressBar;
cPixmap *pixmapLabel;
@@ -20,10 +19,10 @@ private:
void DrawProgressBar(int Current, int Total);
tColor DrawProgressbarBackground(int left, int top, int width, int height);
public:
- cNopacityDisplayVolume(cImageCache *imgCache);
- virtual ~cNopacityDisplayVolume();
+ cNopacityDisplayVolume(void);
+ virtual ~cNopacityDisplayVolume(void);
virtual void SetVolume(int Current, int Total, bool Mute);
virtual void Flush(void);
};
-#endif //__NOPACITY_DISPLAYVOLUME_H \ No newline at end of file
+#endif //__NOPACITY_DISPLAYVOLUME_H
diff --git a/imagecache.c b/imagecache.c
index f473e2d..dc9968d 100644
--- a/imagecache.c
+++ b/imagecache.c
@@ -7,6 +7,8 @@
using namespace Magick;
+cImageCache *imgCache;
+
cImageCache::cImageCache() : cImageMagickWrapper() {
tempStaticLogo = NULL;
osdTheme = Setup.OSDTheme;
diff --git a/imagecache.h b/imagecache.h
index acf3421..a46b63d 100644
--- a/imagecache.h
+++ b/imagecache.h
@@ -106,4 +106,6 @@ private:
void Clear(void);
};
+extern cImageCache *imgCache;
+
#endif //__NOPACITY_IMAGECACHE_H
diff --git a/menudetailview.c b/menudetailview.c
index d59b186..cb11226 100644
--- a/menudetailview.c
+++ b/menudetailview.c
@@ -3,10 +3,9 @@
/********************************************************************************************
* cNopacityDetailView
********************************************************************************************/
-cNopacityDetailView::cNopacityDetailView(eDetailViewType detailViewType, cOsd *osd, cImageCache *imgCache) {
+cNopacityDetailView::cNopacityDetailView(eDetailViewType detailViewType, cOsd *osd) {
type = detailViewType;
this->osd = osd;
- this->imgCache = imgCache;
ev = NULL;
rec = NULL;
text = NULL;
@@ -45,15 +44,15 @@ void cNopacityDetailView::InitiateViewType(void) {
break;
call.event = ev;
if (!pScraper) {
- view = new cNopacityEPGView(osd, imgCache);
+ view = new cNopacityEPGView(osd);
} else if (pScraper->Service("GetEventType", &call)) {
if (call.type == tMovie) {
- view = new cNopacityMovieView(osd, imgCache, call.movieId);
+ view = new cNopacityMovieView(osd, call.movieId);
} else if (call.type == tSeries) {
- view = new cNopacitySeriesView(osd, imgCache, call.seriesId, call.episodeId);
+ view = new cNopacitySeriesView(osd, call.seriesId, call.episodeId);
}
} else {
- view = new cNopacityEPGView(osd, imgCache);
+ view = new cNopacityEPGView(osd);
}
view->SetTitle(ev->Title());
view->SetSubTitle(ev->ShortText());
@@ -75,15 +74,15 @@ void cNopacityDetailView::InitiateViewType(void) {
break;
call.recording = rec;
if (!pScraper) {
- view = new cNopacityEPGView(osd, imgCache);
+ view = new cNopacityEPGView(osd);
} else if (pScraper->Service("GetEventType", &call)) {
if (call.type == tMovie) {
- view = new cNopacityMovieView(osd, imgCache, call.movieId);
+ view = new cNopacityMovieView(osd, call.movieId);
} else if (call.type == tSeries) {
- view = new cNopacitySeriesView(osd, imgCache, call.seriesId, call.episodeId);
+ view = new cNopacitySeriesView(osd, call.seriesId, call.episodeId);
}
} else {
- view = new cNopacityEPGView(osd, imgCache);
+ view = new cNopacityEPGView(osd);
}
const cRecordingInfo *info = rec->Info();
if (info) {
@@ -102,7 +101,7 @@ void cNopacityDetailView::InitiateViewType(void) {
view->SetRecFileName(rec->FileName());
break; }
case dvText:
- view = new cNopacityTextView(osd, imgCache);
+ view = new cNopacityTextView(osd);
view->SetInfoText(text);
break;
default:
diff --git a/menudetailview.h b/menudetailview.h
index 4f0d2af..593435b 100644
--- a/menudetailview.h
+++ b/menudetailview.h
@@ -23,7 +23,6 @@ class cNopacityDetailView : public cThread {
protected:
eDetailViewType type;
cOsd *osd;
- cImageCache *imgCache;
const cEvent *ev;
const cRecording *rec;
const char *text;
@@ -39,7 +38,7 @@ protected:
int ReadSizeVdr(const char *strPath);
virtual void Action(void);
public:
- cNopacityDetailView(eDetailViewType detailViewType, cOsd *osd, cImageCache *imgCache);
+ cNopacityDetailView(eDetailViewType detailViewType, cOsd *osd);
virtual ~cNopacityDetailView(void);
void SetGeometry(int x, int width, int height, int top, int contentBorder, int headerHeight);
void SetEvent(const cEvent *e) { ev = e; };
@@ -49,4 +48,4 @@ public:
void KeyInput(bool Up, bool Page);
};
-#endif //__NOPACITY_MENUDETAILVIEW_H \ No newline at end of file
+#endif //__NOPACITY_MENUDETAILVIEW_H
diff --git a/menuitem.c b/menuitem.c
index 5689319..dad98b4 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -10,9 +10,8 @@
// cNopacityMenuItem -------------
-cNopacityMenuItem::cNopacityMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel) {
+cNopacityMenuItem::cNopacityMenuItem(cOsd *osd, const char *text, bool sel) {
this->osd = osd;
- this->imgCache = imgCache;
drawn = false;
Text = text;
selectable = sel;
@@ -226,7 +225,7 @@ void cNopacityMenuItem::DrawChannelLogoBackground(void) {
}
// cNopacityMainMenuItem -------------
-cNopacityMainMenuItem::cNopacityMainMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel, bool setup) : cNopacityMenuItem (osd, imgCache, text, sel) {
+cNopacityMainMenuItem::cNopacityMainMenuItem(cOsd *osd, const char *text, bool sel, bool setup) : cNopacityMenuItem (osd, text, sel) {
this->isSetup = setup;
}
@@ -434,8 +433,8 @@ void cNopacityMainMenuItem::Render() {
// cNopacityScheduleMenuItem -------------
-cNopacityScheduleMenuItem::cNopacityScheduleMenuItem(cOsd *osd, cImageCache *imgCache, const cEvent *Event, const cChannel *Channel, eTimerMatch TimerMatch, bool sel, eMenuCategory category, cRect *vidWin)
- : cNopacityMenuItem (osd, imgCache, "", sel) {
+cNopacityScheduleMenuItem::cNopacityScheduleMenuItem(cOsd *osd, const cEvent *Event, const cChannel *Channel, eTimerMatch TimerMatch, bool sel, eMenuCategory category, cRect *vidWin)
+ : cNopacityMenuItem (osd, "", sel) {
this->category = category;
this->Event = Event;
this->Channel = Channel;
@@ -672,7 +671,7 @@ void cNopacityScheduleMenuItem::DrawRemaining(int x, int y, int width) {
// cNopacityChannelMenuItem -------------
-cNopacityChannelMenuItem::cNopacityChannelMenuItem(cOsd *osd, cImageCache *imgCache, const cChannel *Channel, bool sel, cRect *vidWin) : cNopacityMenuItem (osd, imgCache, "", sel) {
+cNopacityChannelMenuItem::cNopacityChannelMenuItem(cOsd *osd, const cChannel *Channel, bool sel, cRect *vidWin) : cNopacityMenuItem (osd, "", sel) {
this->Channel = Channel;
this->vidWin = vidWin;
strEntry = "";
@@ -918,7 +917,7 @@ void cNopacityChannelMenuItem::Render() {
// cNopacityTimerMenuItem -------------
-cNopacityTimerMenuItem::cNopacityTimerMenuItem(cOsd *osd, cImageCache *imgCache, const cTimer *Timer, bool sel, cRect *vidWin) : cNopacityMenuItem (osd, imgCache, "", sel) {
+cNopacityTimerMenuItem::cNopacityTimerMenuItem(cOsd *osd, const cTimer *Timer, bool sel, cRect *vidWin) : cNopacityMenuItem (osd, "", sel) {
this->Timer = Timer;
this->vidWin = vidWin;
}
@@ -1114,7 +1113,7 @@ void cNopacityTimerMenuItem::DrawLogo(int logoWidth, int logoHeight) {
}
// cNopacityRecordingMenuItem -------------
-cNopacityRecordingMenuItem::cNopacityRecordingMenuItem(cOsd *osd, cImageCache *imgCache, const cRecording *Recording, bool sel, bool isFolder, int Level, int Total, int New, cRect *vidWin) : cNopacityMenuItem (osd, imgCache, "", sel) {
+cNopacityRecordingMenuItem::cNopacityRecordingMenuItem(cOsd *osd, const cRecording *Recording, bool sel, bool isFolder, int Level, int Total, int New, cRect *vidWin) : cNopacityMenuItem (osd, "", sel) {
this->Recording = Recording;
this->isFolder = isFolder;
this->Level = Level;
@@ -1446,7 +1445,7 @@ void cNopacityRecordingMenuItem::Render() {
// cNopacityDefaultMenuItem -------------
-cNopacityDefaultMenuItem::cNopacityDefaultMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel) : cNopacityMenuItem (osd, imgCache, text, sel) {
+cNopacityDefaultMenuItem::cNopacityDefaultMenuItem(cOsd *osd, const char *text, bool sel) : cNopacityMenuItem (osd, text, sel) {
scrollCol = -1;
}
@@ -1654,7 +1653,7 @@ void cNopacityDefaultMenuItem::Render() {
// cNopacityTrackMenuItem -------------
-cNopacityTrackMenuItem::cNopacityTrackMenuItem(cOsd *osd, cImageCache *imgCache, const char *text) : cNopacityMenuItem (osd, imgCache, text, true) {
+cNopacityTrackMenuItem::cNopacityTrackMenuItem(cOsd *osd, const char *text) : cNopacityMenuItem (osd, text, true) {
}
cNopacityTrackMenuItem::~cNopacityTrackMenuItem(void) {
diff --git a/menuitem.h b/menuitem.h
index aaefb19..835f507 100644
--- a/menuitem.h
+++ b/menuitem.h
@@ -8,7 +8,6 @@
class cNopacityMenuItem : public cThread {
protected:
cOsd *osd;
- cImageCache *imgCache;
cPixmap *pixmapBackground;
cPixmap *pixmapStatic;
cPixmap *pixmapTextScroller;
@@ -41,7 +40,7 @@ protected:
virtual void Action(void);
void DoSleep(int duration);
public:
- cNopacityMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel);
+ cNopacityMenuItem(cOsd *osd, const char *text, bool sel);
virtual ~cNopacityMenuItem(void);
void CreatePixmapBackground();
void CreatePixmapForeground();
@@ -80,7 +79,7 @@ private:
void SetTextFull(void);
void SetTextShort(void);
public:
- cNopacityMainMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel, bool setup);
+ cNopacityMainMenuItem(cOsd *osd, const char *text, bool sel, bool setup);
~cNopacityMainMenuItem(void);
void CreatePixmapTextScroller(int totalWidth);
void CreateText(void);
@@ -109,7 +108,7 @@ private:
void SetTextFull(void);
void SetTextShort(void);
public:
- cNopacityScheduleMenuItem(cOsd *osd, cImageCache *imgCache, const cEvent *Event, const cChannel *Channel, eTimerMatch TimerMatch, bool sel, eMenuCategory category, cRect *vidWin);
+ cNopacityScheduleMenuItem(cOsd *osd, const cEvent *Event, const cChannel *Channel, eTimerMatch TimerMatch, bool sel, eMenuCategory category, cRect *vidWin);
~cNopacityScheduleMenuItem(void);
void CreatePixmapTextScroller(int totalWidth);
void CreateText(void);
@@ -134,7 +133,7 @@ private:
void readCurrentEPG(void);
std::string readEPG(void);
public:
- cNopacityChannelMenuItem(cOsd *osd, cImageCache *imgCache, const cChannel *Channel, bool sel, cRect *vidWin);
+ cNopacityChannelMenuItem(cOsd *osd, const cChannel *Channel, bool sel, cRect *vidWin);
~cNopacityChannelMenuItem(void);
void CreatePixmapTextScroller(int totalWidth);
void CreateText(void);
@@ -155,7 +154,7 @@ private:
void DrawLogo(int logoWidth, int logoHeight);
std::string CreateDate(void);
public:
- cNopacityTimerMenuItem(cOsd *osd, cImageCache *imgCache, const cTimer *Timer, bool sel, cRect *vidWin);
+ cNopacityTimerMenuItem(cOsd *osd, const cTimer *Timer, bool sel, cRect *vidWin);
~cNopacityTimerMenuItem(void);
void CreatePixmapTextScroller(int totalWidth);
void CreateText(void);
@@ -193,7 +192,7 @@ private:
int CheckScrollableRecording(void);
int CheckScrollableFolder(void);
public:
- cNopacityRecordingMenuItem(cOsd *osd, cImageCache *imgCache, const cRecording *Recording, bool sel, bool isFolder, int Level, int Total, int New, cRect *vidWin);
+ cNopacityRecordingMenuItem(cOsd *osd, const cRecording *Recording, bool sel, bool isFolder, int Level, int Total, int New, cRect *vidWin);
~cNopacityRecordingMenuItem(void);
void CreatePixmapTextScroller(int totalWidth);
void CreateText(void);
@@ -214,7 +213,7 @@ private:
void SetTextFull(void);
void SetTextShort(void);
public:
- cNopacityDefaultMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel);
+ cNopacityDefaultMenuItem(cOsd *osd, const char *text, bool sel);
~cNopacityDefaultMenuItem(void);
int CheckScrollable(bool hasIcon);
void Render();
@@ -223,7 +222,7 @@ public:
class cNopacityTrackMenuItem : public cNopacityMenuItem {
private:
public:
- cNopacityTrackMenuItem(cOsd *osd, cImageCache *imgCache, const char *text);
+ cNopacityTrackMenuItem(cOsd *osd, const char *text);
~cNopacityTrackMenuItem(void);
void Render();
};
diff --git a/messagebox.c b/messagebox.c
index 47fdbc1..6352182 100644
--- a/messagebox.c
+++ b/messagebox.c
@@ -3,7 +3,7 @@
#include "imageloader.h"
#include "messagebox.h"
-cNopacityMessageBox::cNopacityMessageBox(cOsd *Osd, cImageCache *imgCache, const cRect &Rect, eMessageType Type, const char *Text, bool isMenuMessage) {
+cNopacityMessageBox::cNopacityMessageBox(cOsd *Osd, const cRect &Rect, eMessageType Type, const char *Text, bool isMenuMessage) {
osd = Osd;
pixmap = osd->CreatePixmap(7, Rect);
pixmapBackground = osd->CreatePixmap(6, Rect);
diff --git a/messagebox.h b/messagebox.h
index ed2c803..6855439 100644
--- a/messagebox.h
+++ b/messagebox.h
@@ -10,7 +10,7 @@ private:
cPixmap *pixmap;
cPixmap *pixmapBackground;
public:
- cNopacityMessageBox(cOsd *Osd, cImageCache *imgCache, const cRect &Rect, eMessageType Type, const char *Text, bool isMenuMessage = false);
+ cNopacityMessageBox(cOsd *Osd, const cRect &Rect, eMessageType Type, const char *Text, bool isMenuMessage = false);
~cNopacityMessageBox();
void SetAlpha(int Alpha);
};
diff --git a/nopacity.c b/nopacity.c
index c194cb8..a4fcfb9 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -11,7 +11,7 @@
#include "displaytracks.h"
#include "displaymessage.h"
-cNopacity::cNopacity(cImageCache *imgCache) : cSkin("nOpacity", &::Theme) {
+cNopacity::cNopacity(void) : cSkin("nOpacity", &::Theme) {
init = true;
config.LoadThemeSpecificConfigs();
config.SetThemeSpecificDefaults();
@@ -22,11 +22,12 @@ cNopacity::cNopacity(cImageCache *imgCache) : cSkin("nOpacity", &::Theme) {
geoManager->SetGeometry();
fontManager = new cFontManager();
fontManager->SetFonts();
- this->imgCache = imgCache;
+ imgCache = new cImageCache();
imgCache->CreateCache();
}
cNopacity::~cNopacity() {
+ delete imgCache;
delete geoManager;
delete fontManager;
}
@@ -41,32 +42,32 @@ cSkinDisplayChannel *cNopacity::DisplayChannel(bool WithInfo) {
imgCache->CreateCacheDelayed();
init = false;
}
- return new cNopacityDisplayChannel(imgCache, WithInfo);
+ return new cNopacityDisplayChannel(WithInfo);
}
cSkinDisplayMenu *cNopacity::DisplayMenu(void) {
ReloadCaches();
- return new cNopacityDisplayMenu(imgCache);
+ return new cNopacityDisplayMenu();
}
cSkinDisplayReplay *cNopacity::DisplayReplay(bool ModeOnly) {
ReloadCaches();
- return new cNopacityDisplayReplay(imgCache, ModeOnly);
+ return new cNopacityDisplayReplay(ModeOnly);
}
cSkinDisplayVolume *cNopacity::DisplayVolume(void) {
ReloadCaches();
- return new cNopacityDisplayVolume(imgCache);
+ return new cNopacityDisplayVolume();
}
cSkinDisplayTracks *cNopacity::DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks) {
ReloadCaches();
- return new cNopacityDisplayTracks(imgCache, Title, NumTracks, Tracks);
+ return new cNopacityDisplayTracks(Title, NumTracks, Tracks);
}
cSkinDisplayMessage *cNopacity::DisplayMessage(void) {
ReloadCaches();
- return new cNopacityDisplayMessage(imgCache);
+ return new cNopacityDisplayMessage();
}
void cNopacity::ReloadCaches(void) {
diff --git a/nopacity.h b/nopacity.h
index b7db796..fc36af9 100644
--- a/nopacity.h
+++ b/nopacity.h
@@ -9,11 +9,10 @@ class cNopacityDisplayMenu;
class cNopacity : public cSkin {
private:
- cImageCache *imgCache;
bool init;
void ReloadCaches(void);
public:
- cNopacity(cImageCache *imgCache);
+ cNopacity(void);
~cNopacity(void);
virtual const char *Description(void);
virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
diff --git a/setup.c b/setup.c
index 169e698..5258051 100644
--- a/setup.c
+++ b/setup.c
@@ -1,7 +1,6 @@
#include "setup.h"
-cNopacitySetup::cNopacitySetup(cImageCache *imgCache) {
- this->imgCache = imgCache;
+cNopacitySetup::cNopacitySetup(void) {
tmpConf = config;
cFont::GetAvailableFontNames(&fontNames);
fontNames.Insert(strdup(config.fontDefaultName));
@@ -73,7 +72,7 @@ eOSState cNopacitySetup::ProcessKey(eKeys Key) {
if (strcmp(ItemText, tr("Volume")) == 0)
state = AddSubMenu(new cNopacitySetupVolumeDisplay(&tmpConf));
if (strcmp(ItemText, tr("Image Caching")) == 0)
- state = AddSubMenu(new cNopacitySetupCaching(&tmpConf, imgCache));
+ state = AddSubMenu(new cNopacitySetupCaching(&tmpConf));
}
}
return state;
@@ -505,8 +504,7 @@ void cNopacitySetupVolumeDisplay::Set(void) {
//-----Image Caching-------------------------------------------------------------------------------------------------------------
-cNopacitySetupCaching::cNopacitySetupCaching(cNopacityConfig* data, cImageCache *imgCache) : cMenuSetupSubMenu(tr("Image Caching"), data) {
- this->imgCache = imgCache;
+cNopacitySetupCaching::cNopacitySetupCaching(cNopacityConfig* data) : cMenuSetupSubMenu(tr("Image Caching"), data) {
Set();
}
@@ -530,4 +528,4 @@ void cNopacitySetupCaching::Set(void) {
SetCurrent(Get(currentItem));
Display();
-} \ No newline at end of file
+}
diff --git a/setup.h b/setup.h
index e4da4e1..8e6846a 100644
--- a/setup.h
+++ b/setup.h
@@ -6,11 +6,10 @@
class cNopacitySetup : public cMenuSetupPage {
public:
- cNopacitySetup(cImageCache *imgCache);
+ cNopacitySetup(void);
virtual ~cNopacitySetup();
private:
cNopacityConfig tmpConf;
- cImageCache *imgCache;
cStringList fontNames;
void Setup(void);
protected:
@@ -19,7 +18,6 @@ class cNopacitySetup : public cMenuSetupPage {
};
-
class cMenuSetupSubMenu : public cOsdMenu {
protected:
cNopacityConfig *tmpConf;
@@ -135,9 +133,8 @@ class cNopacitySetupVolumeDisplay : public cMenuSetupSubMenu {
class cNopacitySetupCaching : public cMenuSetupSubMenu {
protected:
- cImageCache *imgCache;
void Set(void);
public:
- cNopacitySetupCaching(cNopacityConfig *data, cImageCache *imgCache);
+ cNopacitySetupCaching(cNopacityConfig *data);
};
-#endif //__NOPACITY_SETUP_H \ No newline at end of file
+#endif //__NOPACITY_SETUP_H
diff --git a/skinnopacity.c b/skinnopacity.c
index cd55819..4936085 100644
--- a/skinnopacity.c
+++ b/skinnopacity.c
@@ -24,7 +24,6 @@ static const char *MAINMENUENTRY = "nOpacity";
class cPluginNopacity : public cPlugin {
private:
cNopacity *nopacity;
- cImageCache *imgCache;
public:
cPluginNopacity(void);
virtual ~cPluginNopacity();
@@ -108,13 +107,11 @@ bool cPluginNopacity::Start(void) {
} else
dsyslog("nopacity: TrueColor OSD found");
- imgCache = new cImageCache();
- nopacity = new cNopacity(imgCache);
+ nopacity = new cNopacity();
return nopacity;
}
void cPluginNopacity::Stop(void) {
- delete imgCache;
}
void cPluginNopacity::Housekeeping(void) {
@@ -136,7 +133,7 @@ cOsdObject *cPluginNopacity::MainMenuAction(void) {
}
cMenuSetupPage *cPluginNopacity::SetupMenu(void) {
- return new cNopacitySetup(imgCache);
+ return new cNopacitySetup();
}
bool cPluginNopacity::SetupParse(const char *Name, const char *Value) {
diff --git a/timers.c b/timers.c
index 7c3c197..409da48 100644
--- a/timers.c
+++ b/timers.c
@@ -4,18 +4,16 @@
#include "helpers.h"
#include <vdr/recording.h>
-cNopacityTimer::cNopacityTimer(cOsd *osd, cImageCache *imgCache, const cTimer *timer, const cFont *font, const cFont *fontLarge) {
+cNopacityTimer::cNopacityTimer(cOsd *osd, const cTimer *timer, const cFont *font, const cFont *fontLarge) {
this->osd = osd;
- this->imgCache = imgCache;
this->timer = timer;
this->font = font;
this->fontLarge = fontLarge;
isTimerConflict = false;
}
-cNopacityTimer::cNopacityTimer(cOsd *osd, cImageCache *imgCache, int numConflicts, const cFont *font, const cFont *fontLarge) {
+cNopacityTimer::cNopacityTimer(cOsd *osd, int numConflicts, const cFont *font, const cFont *fontLarge) {
this->osd = osd;
- this->imgCache = imgCache;
this->numConflicts = numConflicts;
this->font = font;
this->fontLarge = fontLarge;
@@ -215,4 +213,4 @@ int cNopacityTimer::DrawLogo(void) {
}
}
return totalHeight;
-} \ No newline at end of file
+}
diff --git a/timers.h b/timers.h
index 6142dfd..2522449 100644
--- a/timers.h
+++ b/timers.h
@@ -9,7 +9,6 @@
class cNopacityTimer : public cListObject {
private:
cOsd *osd;
- cImageCache *imgCache;
cPixmap *pixmapBackground;
cPixmap *pixmap;
cPixmap *pixmapLogo;
@@ -26,8 +25,8 @@ class cNopacityTimer : public cListObject {
cTextWrapper showName;
int DrawLogo(void);
public:
- cNopacityTimer(cOsd *osd, cImageCache *imgCache, const cTimer *timer, const cFont *font, const cFont *fontLarge);
- cNopacityTimer(cOsd *osd, cImageCache *imgCache, int numConflicts, const cFont *font, const cFont *fontLarge);
+ cNopacityTimer(cOsd *osd, const cTimer *timer, const cFont *font, const cFont *fontLarge);
+ cNopacityTimer(cOsd *osd, int numConflicts, const cFont *font, const cFont *fontLarge);
virtual ~cNopacityTimer(void);
void SetGeometry(int width, int y);
void CreateDate(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 10:26:07 +0000