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

Fixed dropping out of replay mode while viewing a recording that is still going on

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-09-09 16:09:05 +02:00
parent ec78dbe9e4
commit 19efbe4503
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -491,6 +491,8 @@ Oliver Endriss <o.endriss@gmx.de>
for fixing I/O handling in case an explicit controlling terminal is given for fixing I/O handling in case an explicit controlling terminal is given
for fixing displaying still pictures, now using the driver's VIDEO_STILLPICTURE call for fixing displaying still pictures, now using the driver's VIDEO_STILLPICTURE call
directly directly
for reporting and helping to debug dropping out of replay mode while viewing a
recording that is still going on
Reinhard Walter Buchner <rw.buchner@freenet.de> Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf' for adding some satellites to 'sources.conf'

6
HISTORY
View File

@ -2375,3 +2375,9 @@ Video Disk Recorder Revision History
- The DVB devices no longer send CA descriptors to the CAM while the EPG scanner - The DVB devices no longer send CA descriptors to the CAM while the EPG scanner
is active (sometimes the CAMs got irritated when the device tuned to channels is active (sometimes the CAMs got irritated when the device tuned to channels
they couldn't handle). they couldn't handle).
2003-09-09: Version 1.2.5
- Fixed dropping out of replay mode while viewing a recording that is still
going on (thanks to Oliver Endriss for reporting and helping to debug this
one).

4
config.h
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: config.h 1.171 2003/09/05 13:18:38 kls Exp $ * $Id: config.h 1.172 2003/09/09 16:06:09 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -19,7 +19,7 @@
#include "device.h" #include "device.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.2.5pre2" #define VDRVERSION "1.2.5"
#define VDRVERSNUM 10205 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10205 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99

3
recording.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: recording.c 1.82 2003/08/17 09:10:46 kls Exp $ * $Id: recording.c 1.83 2003/09/09 16:02:55 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -859,6 +859,7 @@ bool cIndexFile::CatchUp(int Index)
{ {
// returns true unless something really goes wrong, so that 'index' becomes NULL // returns true unless something really goes wrong, so that 'index' becomes NULL
if (index && f >= 0) { if (index && f >= 0) {
cMutexLock MutexLock(&mutex);
for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) { for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
struct stat buf; struct stat buf;
if (fstat(f, &buf) == 0) { if (fstat(f, &buf) == 0) {

4
recording.h
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: recording.h 1.26 2003/08/17 09:03:46 kls Exp $ * $Id: recording.h 1.27 2003/09/09 16:00:56 kls Exp $
*/ */
#ifndef __RECORDING_H #ifndef __RECORDING_H
@ -12,6 +12,7 @@
#include <time.h> #include <time.h>
#include "config.h" #include "config.h"
#include "thread.h"
#include "timers.h" #include "timers.h"
#include "tools.h" #include "tools.h"
@ -130,6 +131,7 @@ private:
int size, last; int size, last;
tIndex *index; tIndex *index;
cResumeFile resumeFile; cResumeFile resumeFile;
cMutex mutex;
bool CatchUp(int Index = -1); bool CatchUp(int Index = -1);
public: public:
cIndexFile(const char *FileName, bool Record); cIndexFile(const char *FileName, bool Record);