diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 46a4c62b..c8861486 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2321,6 +2321,8 @@ Christoph Haubrich for suggesting to check for NULL in cOsd::AddPixmap() for making modified editing marks be written to disk whenever the replay progress display gets hidden + for reporting a wrong type ('int' vs. 'eTimerEvent') in the declaration of + cSkinDisplayMenu::SetItemEvent() Pekka Mauno for fixing cSchedule::GetFollowingEvent() in case there is currently no present diff --git a/HISTORY b/HISTORY index 1732f875..07d5bc60 100644 --- a/HISTORY +++ b/HISTORY @@ -7416,3 +7416,8 @@ Video Disk Recorder Revision History SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin plugins to display these items in a more elaborate way than just a simple line of text. + +2012-12-11: Version 1.7.34 + +- Changed the type of the TimerMatch parameter in cSkinDisplayMenu::SetItemEvent() from + 'int' to 'eTimerEvent' (reported by Christoph Haubrich). diff --git a/config.h b/config.h index 5c962fb3..3624d9dc 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.57 2012/12/05 11:33:20 kls Exp $ + * $Id: config.h 2.58 2012/12/11 09:59:16 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.33" -#define VDRVERSNUM 10733 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.34" +#define VDRVERSNUM 10734 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.33" -#define APIVERSNUM 10733 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.34" +#define APIVERSNUM 10734 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to diff --git a/skins.h b/skins.h index 25061268..cc0ac5dd 100644 --- a/skins.h +++ b/skins.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skins.h 2.7 2012/12/07 17:18:44 kls Exp $ + * $Id: skins.h 2.8 2012/12/11 09:58:53 kls Exp $ */ #ifndef __SKINS_H @@ -153,7 +153,7 @@ public: ///< this function will be first called for the old current item ///< with Current set to false, and then for the new current item ///< with Current set to true. - virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, int TimerMatch) { return false; } + virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) { return false; } ///< Sets the item at the given Index to Event. See SetItem() for more information. ///< If a derived skin class implements this function, it can display an Event item ///< in a more elaborate way than just a simple line of text.