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

Changes in cRecManager::SaveTimer

Browse Source
This commit is contained in:
kamel5 2018-04-01 14:06:43 +02:00 committed by kamel5
parent 39dfe767fc
commit 91488f0f60
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
recmanager.c
View File

@ -264,13 +264,18 @@ void cRecManager::DeleteRemoteTimer(const cEvent *event) {
} }
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
void cRecManager::SaveTimer(const cTimer *timer, cTimer newTimerSettings) { void cRecManager::SaveTimer(const cTimer *t, cTimer newTimerSettings) {
if (!t)
#else #else
void cRecManager::SaveTimer(cTimer *timer, cTimer newTimerSettings) { void cRecManager::SaveTimer(cTimer *timer, cTimer newTimerSettings) {
#endif
if (!timer) if (!timer)
#endif
return; return;
#if VDRVERSNUM >= 20301
LOCK_TIMERS_WRITE;
cTimer *timer = Timers->GetTimer(t);
#endif
bool active = newTimerSettings.HasFlags(tfActive); bool active = newTimerSettings.HasFlags(tfActive);
int prio = newTimerSettings.Priority(); int prio = newTimerSettings.Priority();
int lifetime = newTimerSettings.Lifetime(); int lifetime = newTimerSettings.Lifetime();
@ -279,48 +284,29 @@ void cRecManager::SaveTimer(cTimer *timer, cTimer newTimerSettings) {
int stop = newTimerSettings.Stop(); int stop = newTimerSettings.Stop();
std::string fileName = newTimerSettings.File(); std::string fileName = newTimerSettings.File();
#if VDRVERSNUM >= 20301
((cTimer*)timer)->SetDay(day);
((cTimer*)timer)->SetStart(start);
((cTimer*)timer)->SetStop(stop);
((cTimer*)timer)->SetPriority(prio);
((cTimer*)timer)->SetLifetime(lifetime);
((cTimer*)timer)->SetFile(fileName.c_str());
#else
timer->SetDay(day); timer->SetDay(day);
timer->SetStart(start); timer->SetStart(start);
timer->SetStop(stop); timer->SetStop(stop);
timer->SetPriority(prio); timer->SetPriority(prio);
timer->SetLifetime(lifetime); timer->SetLifetime(lifetime);
timer->SetFile(fileName.c_str()); timer->SetFile(fileName.c_str());
#endif
if (timer->HasFlags(tfActive) && !active) if (timer->HasFlags(tfActive) && !active)
#if VDRVERSNUM >= 20301
((cTimer*)timer)->ClrFlags(tfActive);
else if (!timer->HasFlags(tfActive) && active)
((cTimer*)timer)->SetFlags(tfActive);
#else
timer->ClrFlags(tfActive); timer->ClrFlags(tfActive);
else if (!timer->HasFlags(tfActive) && active) else if (!timer->HasFlags(tfActive) && active)
timer->SetFlags(tfActive); timer->SetFlags(tfActive);
#if VDRVERSNUM < 20300
timer->SetEventFromSchedule(); timer->SetEventFromSchedule();
#endif #endif
if (tvguideConfig.useRemoteTimers && pRemoteTimers) { if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
RemoteTimers_Timer_v1_0 rt; RemoteTimers_Timer_v1_0 rt;
#if VDRVERSNUM >= 20301
rt.timer = (cTimer*)timer;
#else
rt.timer = timer; rt.timer = timer;
#endif
if (!pRemoteTimers->Service("RemoteTimers::ModTimer-v1.0", &rt)) if (!pRemoteTimers->Service("RemoteTimers::ModTimer-v1.0", &rt))
rt.timer = NULL; rt.timer = NULL;
RefreshRemoteTimers(); RefreshRemoteTimers();
} else { } else {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_TIMERS_WRITE;
Timers->SetModified(); Timers->SetModified();
#else #else
Timers.SetModified(); Timers.SetModified();