summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2017-08-27 15:29:22 +0200
committerMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2017-08-27 15:29:22 +0200
commitb4b62d764e6e1a75329c3fb4864a1f082503740b (patch)
treec2ade7c3f1fc7fc4949e10e6c3c29ae4dbb69f4b
parent2d5e027d9c7614fa55a670b569d48340e6084515 (diff)
downloadskin-flatplus-b4b62d764e6e1a75329c3fb4864a1f082503740b.tar.gz
skin-flatplus-b4b62d764e6e1a75329c3fb4864a1f082503740b.tar.bz2
[update] support for vdr 2.3.8
-rw-r--r--HISTORY1
-rw-r--r--displaymenu.c2
-rw-r--r--displaymenu.h5
3 files changed, 6 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index a4574847..30c1533c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ VDR Plugin 'skinflatplus' Revision History
201X-XX-XX: Version XXX
- [fix] '%' sign not shown in menu weather widget at certian font
- [update] use std::min & std:max
+- [update] support for vdr 2.3.8
- [add] support for change color key mapping
- [add] displaychannel show event start time on the left before event title
diff --git a/displaymenu.c b/displaymenu.c
index 8a52adbc..cb873115 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -1491,7 +1491,7 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current
return true;
}
-bool cFlatDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) {
+bool cFlatDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch, bool TimerActive) {
if( Config.MenuEventView == 0 )
return false;
diff --git a/displaymenu.h b/displaymenu.h
index 28fd791e..dc01e28e 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -113,6 +113,9 @@ class cFlatDisplayMenu : public cFlatBaseRender, public cSkinDisplayMenu {
int DrawMainMenuWidgetCommand(int wLeft, int wWidth, int ContentTop);
int DrawMainMenuWidgetWeather(int wLeft, int wWidth, int ContentTop);
public:
+#ifdef DEPRECATED_SKIN_SETITEMEVENT
+ using cSkinDisplayMenu::SetItemEvent;
+#endif
cFlatDisplayMenu(void);
virtual ~cFlatDisplayMenu();
virtual void Scroll(bool Up, bool Page);
@@ -127,7 +130,7 @@ class cFlatDisplayMenu : public cFlatBaseRender, public cSkinDisplayMenu {
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);