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

The return type of cMarks::Add() has been changed to void

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-11-12 14:51:18 +01:00
parent b951ca48a5
commit bc06fdf414
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -7312,3 +7312,6 @@ Video Disk Recorder Revision History
start up to twice as fast as before. start up to twice as fast as before.
- Updated the Romanian OSD texts (thanks to Lucian Muresan). - Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Fixed handling the very last entry in a recording index. - Fixed handling the very last entry in a recording index.
- The return type of cMarks::Add() has been changed to void, since due to the sorting
of the list of marks the returned pointer might have pointed to a totally different
mark. Besides, the return value was never actually used.

12
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 2.71 2012/11/12 14:48:12 kls Exp $ * $Id: recording.c 2.72 2012/11/12 14:51:09 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -1423,14 +1423,10 @@ void cMarks::Sort(void)
} }
} }
cMark *cMarks::Add(int Position) void cMarks::Add(int Position)
{ {
cMark *m = Get(Position); cConfig<cMark>::Add(new cMark(Position, NULL, framesPerSecond));
if (!m) { Sort();
cConfig<cMark>::Add(m = new cMark(Position, NULL, framesPerSecond));
Sort();
}
return m;
} }
cMark *cMarks::Get(int Position) cMark *cMarks::Get(int Position)

5
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 2.38 2012/10/15 10:22:27 kls Exp $ * $Id: recording.h 2.39 2012/11/12 14:51:09 kls Exp $
*/ */
#ifndef __RECORDING_H #ifndef __RECORDING_H
@ -234,7 +234,7 @@ public:
bool Update(void); bool Update(void);
void Align(void); void Align(void);
void Sort(void); void Sort(void);
cMark *Add(int Position); void Add(int Position);
cMark *Get(int Position); cMark *Get(int Position);
cMark *GetPrev(int Position); cMark *GetPrev(int Position);
cMark *GetNext(int Position); cMark *GetNext(int Position);
@ -301,6 +301,7 @@ public:
///< If there is no actual index data available, 0 is returned. ///< If there is no actual index data available, 0 is returned.
int Get(uint16_t FileNumber, off_t FileOffset); int Get(uint16_t FileNumber, off_t FileOffset);
int Last(void) { CatchUp(); return last; } int Last(void) { CatchUp(); return last; }
///< Returns the index of the last entry in this file, or -1 if the file is empty.
int GetResume(void) { return resumeFile.Read(); } int GetResume(void) { return resumeFile.Read(); }
bool StoreResume(int Index) { return resumeFile.Save(Index); } bool StoreResume(int Index) { return resumeFile.Save(Index); }
bool IsStillRecording(void); bool IsStillRecording(void);