frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

When making modifications to remote timers, the local VDR no longer sends a POLL to all remote VDRs

Browse Source
This commit is contained in:
Klaus Schmidinger 2018-03-05 15:49:20 +01:00
parent 1f9832b449
commit a7fdd3c165
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History
a subdirectory. a subdirectory.
- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details). - SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
2018-03-04: Version 2.3.9 2018-03-05: Version 2.3.9
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@ -9296,3 +9296,5 @@ Video Disk Recorder Revision History
- Modified cStateLock's SetExplicitModify() and IncState() (changed to SetModified()) to - Modified cStateLock's SetExplicitModify() and IncState() (changed to SetModified()) to
allow for the introduction of syncing a separate cStateKey to a cStateLock. allow for the introduction of syncing a separate cStateKey to a cStateLock.
- Assigning events to timers no longer triggers sending a POLL to all peer VDRs. - Assigning events to timers no longer triggers sending a POLL to all peer VDRs.
- When making modifications to remote timers, the local VDR no longer sends a POLL to
all remote VDRs.

14
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 4.65 2018/03/03 12:55:57 kls Exp $ * $Id: menu.c 4.66 2018/03/05 15:37:23 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1122,6 +1122,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
return osContinue; return osContinue;
if (timer->Local() && timer->Recording() && data.Remote()) if (timer->Local() && timer->Recording() && data.Remote())
cRecordControls::Stop(timer); cRecordControls::Stop(timer);
if (timer->Remote() && data.Remote())
Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
*timer = data; *timer = data;
} }
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
@ -1296,11 +1298,12 @@ eOSState cMenuTimers::OnOff(void)
if (HasSubMenu()) if (HasSubMenu())
return osContinue; return osContinue;
cStateKey StateKey; cStateKey StateKey;
cTimers::GetTimersWrite(StateKey); cTimers *Timers = cTimers::GetTimersWrite(StateKey);
cTimer *Timer = GetTimer(); cTimer *Timer = GetTimer();
if (Timer) { if (Timer) {
Timer->OnOff(); Timer->OnOff();
if (Timer->Remote()) { if (Timer->Remote()) {
Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
cStringList Response; cStringList Response;
if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("MODT %d %s", Timer->Id(), *Timer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250) if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("MODT %d %s", Timer->Id(), *Timer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
RemoteTimerError(Timer); RemoteTimerError(Timer);
@ -1357,6 +1360,8 @@ eOSState cMenuTimers::Delete(void)
timersStateKey.Remove(); timersStateKey.Remove();
return osContinue; return osContinue;
} }
if (Timer->Remote())
Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
Timers->Del(Timer); Timers->Del(Timer);
cOsdMenu::Del(Current()); cOsdMenu::Del(Current());
Display(); Display();
@ -1684,6 +1689,8 @@ eOSState cMenuWhatsOn::Record(void)
// must add the timer before HandleRemoteModifications to get proper log messages with timer ids // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
Timers->Del(Timer); Timers->Del(Timer);
} }
else if (Timer->Remote())
Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
if (HasSubMenu()) if (HasSubMenu())
CloseSubMenu(); CloseSubMenu();
if (Update()) if (Update())
@ -1990,6 +1997,8 @@ eOSState cMenuSchedule::Record(void)
// must add the timer before HandleRemoteModifications to get proper log messages with timer ids // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
Timers->Del(Timer); Timers->Del(Timer);
} }
else if (Timer->Remote())
Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
if (HasSubMenu()) if (HasSubMenu())
CloseSubMenu(); CloseSubMenu();
if (Update()) if (Update())
@ -3144,6 +3153,7 @@ static bool TimerStillRecording(const char *FileName)
if (cTimer *Timer = Timers->GetById(Id, Remote)) { if (cTimer *Timer = Timers->GetById(Id, Remote)) {
cTimer OldTimer = *Timer; cTimer OldTimer = *Timer;
Timer->Skip(); Timer->Skip();
Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
if (Timer->IsSingleEvent()) { if (Timer->IsSingleEvent()) {
if (HandleRemoteModifications(NULL, Timer)) if (HandleRemoteModifications(NULL, Timer))
Timers->Del(Timer); Timers->Del(Timer);