From 0bc43eb96d39def7e931202146c3b83a2aa4e58a Mon Sep 17 00:00:00 2001 From: kamel5 Date: Mon, 7 Jan 2019 12:57:45 +0100 Subject: Changes for VDR-2.3.1 --- channelgroups.h | 13 +++++++++++++ definitions.h | 10 +++++----- switchtimer.h | 14 ++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/channelgroups.h b/channelgroups.h index 19c8e8f..0b99a90 100644 --- a/channelgroups.h +++ b/channelgroups.h @@ -16,6 +16,19 @@ private: int channelStop; string name; public: + cChannelGroup(const cChannelGroup &ChannelGroup) + { + *this = ChannelGroup; + }; + cChannelGroup& operator= (const cChannelGroup &ChannelGroup) + { + this->id = ChannelGroup.id; + this->channelStart = ChannelGroup.channelStart; + this->channelStop = ChannelGroup.channelStop; + this->name = ChannelGroup.name; + + return *this; + }; cChannelGroup(string name, int id); virtual ~cChannelGroup(void); int GetId(void) { return id; }; diff --git a/definitions.h b/definitions.h index 32a5c45..17207b9 100644 --- a/definitions.h +++ b/definitions.h @@ -234,7 +234,7 @@ enum class eScraperHeaderIT { }; enum class eDetailedHeaderST { - title = eScraperHeaderST::count, + title = (int)eScraperHeaderST::count, shorttext, start, stop, @@ -249,7 +249,7 @@ enum class eDetailedHeaderST { }; enum class eDetailedHeaderIT { - daynumeric = eScraperHeaderIT::count, + daynumeric = (int)eScraperHeaderIT::count, month, year, running, @@ -375,7 +375,7 @@ enum class eScraperLT { }; enum class eDetailedEpgST { - title = eScraperST::count, + title = (int)eScraperST::count, shorttext, description, start, @@ -393,7 +393,7 @@ enum class eDetailedEpgST { }; enum class eDetailedEpgIT { - daynumeric = eScraperIT::count, + daynumeric = (int)eScraperIT::count, month, year, running, @@ -543,4 +543,4 @@ enum class eRecMenuST { count }; -#endif //__DEFINITIONS_H \ No newline at end of file +#endif //__DEFINITIONS_H diff --git a/switchtimer.h b/switchtimer.h index eea468f..ba1479a 100644 --- a/switchtimer.h +++ b/switchtimer.h @@ -11,6 +11,20 @@ public: tChannelID channelID; int switchMinsBefore; int announceOnly; + cSwitchTimer(const cSwitchTimer &SwitchTimer) + { + *this = SwitchTimer; + }; + cSwitchTimer& operator= (const cSwitchTimer &SwitchTimer) + { + this->eventID = SwitchTimer.eventID; + this->startTime = SwitchTimer.startTime; + this->channelID = SwitchTimer.channelID; + this->switchMinsBefore = SwitchTimer.switchMinsBefore; + this->announceOnly = SwitchTimer.announceOnly; + + return *this; + }; cSwitchTimer(void); cSwitchTimer(const cEvent* Event); bool Parse(const char *s); -- cgit v1.2.3