Compile under VDR 2.3.1

This commit is contained in:
kamel5
2018-03-08 13:02:38 +01:00
committed by kamel5
parent 8287bb5f7d
commit cbc6f44264
19 changed files with 670 additions and 5 deletions

View File

@@ -115,7 +115,11 @@ public:
// --- cRecMenuEditTimer ---------------------------------------------------------
class cRecMenuEditTimer: public cRecMenu {
private:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
const cTimer *originalTimer;
#else
cTimer *originalTimer;
#endif
bool timerActive;
time_t day;
int start;
@@ -124,10 +128,15 @@ private:
int lifetime;
char folder[TEXTINPUTLENGTH];
public:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState);
const cTimer *GetOriginalTimer(void);
#else
cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState);
cTimer *GetOriginalTimer(void);
#endif
virtual ~cRecMenuEditTimer(void) {};
cTimer GetTimer(void);
cTimer *GetOriginalTimer(void);
};
/******************************************************************************************
@@ -148,7 +157,11 @@ class cRecMenuSeriesTimer: public cRecMenu {
int lifetime;
void CalculateTimes(const cEvent *event);
public:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder);
#else
cRecMenuSeriesTimer(cChannel *initialChannel, const cEvent *event, std::string folder);
#endif
virtual ~cRecMenuSeriesTimer(void) {};
cTimer *GetTimer(void);
};
@@ -412,10 +425,18 @@ public:
class cRecMenuRecordingSearchResults: public cRecMenu {
private:
std::string searchString;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
const cRecording **searchResults;
#else
cRecording **searchResults;
#endif
int numResults;
public:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
cRecMenuRecordingSearchResults(std::string searchString, const cRecording **searchResults, int numResults);
#else
cRecMenuRecordingSearchResults(std::string searchString, cRecording **searchResults, int numResults);
#endif
cRecMenuItem *GetMenuItem(int number);
int GetTotalNumMenuItems(void);
virtual ~cRecMenuRecordingSearchResults(void) {
@@ -438,7 +459,11 @@ public:
// --- cRecMenuTimeline ---------------------------------------------------------
class cRecMenuTimeline: public cRecMenu {
private:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
std::vector<const cTimer*> timersToday;
#else
std::vector<cTimer*> timersToday;
#endif
int numTimersToday;
time_t today;
time_t timeStart;
@@ -459,7 +484,11 @@ public:
virtual ~cRecMenuTimeline(void) {
};
eRecMenuState ProcessKey(eKeys Key);
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
const cTimer *GetTimer(void);
#else
cTimer *GetTimer(void);
#endif
};
/******************************************************************************************