From e2db68198582fe7a2e85dd616f575fd321a3970f Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 3 May 2018 13:44:10 +0200 Subject: Changes for TimerActive --- displaymenu.c | 2 +- displaymenu.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/displaymenu.c b/displaymenu.c index 319a7a8..0302e8f 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -369,7 +369,7 @@ void cNopacityDisplayMenu::SetMessage(eMessageType Type, const char *Text) { } bool cNopacityDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current, - bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) { + bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch, bool TimerActive) { if (!config.GetValue("narrowScheduleMenu")) return false; diff --git a/displaymenu.h b/displaymenu.h index 761bb51..a90e2ce 100644 --- a/displaymenu.h +++ b/displaymenu.h @@ -37,6 +37,9 @@ private: protected: int Tab(int n); public: +#ifdef DEPRECATED_SKIN_SETITEMEVENT + using cSkinDisplayMenu::SetItemEvent; +#endif cNopacityDisplayMenu(cImageCache *imgCache); virtual ~cNopacityDisplayMenu(); virtual void Scroll(bool Up, bool Page); @@ -47,7 +50,7 @@ public: virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL); virtual void SetMessage(eMessageType Type, const char *Text); virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable); - virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch); + virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch, bool TimerActive); virtual bool SetItemTimer(const cTimer *Timer, int Index, bool Current, bool Selectable); virtual bool SetItemChannel(const cChannel *Channel, int Index, bool Current, bool Selectable, bool WithProvider); virtual bool SetItemRecording(const cRecording *Recording, int Index, bool Current, bool Selectable, int Level, int Total, int New); @@ -61,4 +64,4 @@ public: virtual const cFont *GetTextAreaFont(bool FixedFont) const; }; -#endif //__NOPACITY_DISPLAYMENU_H \ No newline at end of file +#endif //__NOPACITY_DISPLAYMENU_H -- cgit v1.2.3