frodovdr/vdr-plugin-tvguide
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git synced 2023-10-05 15:01:48 +02:00
Code Issues Releases Wiki Activity

Fixed a compiler error for VDR < 2.3.0 and Cosmetic changes

Browse Source
This commit is contained in:
kamel5 2019-07-06 12:14:19 +02:00
parent 69711400fa
commit ad1f0ba0d6
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
recmanager.c
View File

@ -231,7 +231,8 @@ void cRecManager::DeleteTimer(const cTimer *timer) {
cTimers* timers = &Timers; cTimers* timers = &Timers;
cTimer* t = timers->GetTimer((cTimer*)timer); cTimer* t = timers->GetTimer((cTimer*)timer);
#endif #endif
if (!t)
return;
if (t->Recording()) { if (t->Recording()) {
t->Skip(); t->Skip();
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
@ -341,8 +342,7 @@ cTVGuideTimerConflicts *cRecManager::CheckTimerConflict(void) {
} }
void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) { void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM < 20300
#else
seriesTimer->SetEventFromSchedule(); seriesTimer->SetEventFromSchedule();
#endif #endif
if (tvguideConfig.useRemoteTimers && pRemoteTimers) { if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
@ -355,12 +355,11 @@ void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_TIMERS_WRITE; LOCK_TIMERS_WRITE;
cTimers* timers = Timers; cTimers* timers = Timers;
#else
cTimers* timers = &Timers;
#endif
timers->Add(seriesTimer); timers->Add(seriesTimer);
timers->SetModified(); timers->SetModified();
#else
Timers.Add(seriesTimer);
Timers.SetModified();
#endif
} }
} }

5
searchtimer.h
View File

@ -12,13 +12,8 @@ protected:
int startTime; int startTime;
int stopTime; int stopTime;
int useChannel; int useChannel;
#if VDRVERSNUM >= 20301
const cChannel *channelMin; const cChannel *channelMin;
const cChannel *channelMax; const cChannel *channelMax;
#else
cChannel *channelMin;
cChannel *channelMax;
#endif
std::string channelGroup; std::string channelGroup;
int useCase; int useCase;
int mode; int mode;