Reverted to the previous way of searching for the EPG record of the current recording in case of a periodic timer

This commit is contained in:
Klaus Schmidinger 2002-02-09 15:27:39 +01:00
parent aa80fad981
commit 13a0aff6b9
2 changed files with 5 additions and 2 deletions

View File

@ -978,3 +978,6 @@ Video Disk Recorder Revision History
to 25.75 MB/min. to 25.75 MB/min.
- Only reporting the 'EPG bugfix statistics' if there really were any fixes. - Only reporting the 'EPG bugfix statistics' if there really were any fixes.
- Added Finnish language texts (thanks to Hannu Savolainen). - Added Finnish language texts (thanks to Hannu Savolainen).
- Reverted to the previous way of searching for the EPG record of the current
recording in case of a periodic timer (i.e. taking the one that is in the
middle between start and end time).

4
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 1.149 2002/02/09 14:42:56 kls Exp $ * $Id: menu.c 1.150 2002/02/09 15:25:27 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2341,7 +2341,7 @@ cRecordControl::~cRecordControl()
bool cRecordControl::GetEventInfo(void) bool cRecordControl::GetEventInfo(void)
{ {
cChannel *channel = Channels.GetByNumber(timer->channel); cChannel *channel = Channels.GetByNumber(timer->channel);
time_t Time = timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60; time_t Time = timer->IsSingleEvent() ? timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60 : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) { for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
{ {
cThreadLock ThreadLock; cThreadLock ThreadLock;