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

Made cRecordingInfo::Read(FILE *f) private

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-04-03 11:22:16 +02:00
parent c23b6a7e13
commit 05ea68e2bb
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -2684,3 +2684,6 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de>
Sergiu Dotenco <sergiu.dotenco@googlemail.com> Sergiu Dotenco <sergiu.dotenco@googlemail.com>
for reporting a missing initialization in sDvbSpuRect for reporting a missing initialization in sDvbSpuRect
for replacing "%lld" and "%llX" print format specifiers with "PRId64" and "PRIX64" for replacing "%lld" and "%llX" print format specifiers with "PRId64" and "PRIX64"
Mika Laitio <lamikr@pilppa.org>
for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer

2
HISTORY
View File

@ -6594,3 +6594,5 @@ Video Disk Recorder Revision History
(thanks to Reinhard Nissl). (thanks to Reinhard Nissl).
- Fixed a buffer overflow in cFont::Bidi() (thanks to Reinhard Nissl). - Fixed a buffer overflow in cFont::Bidi() (thanks to Reinhard Nissl).
- Added HD stream content identifiers to vdr.5 (thanks to Christoph Haubrich). - Added HD stream content identifiers to vdr.5 (thanks to Christoph Haubrich).
- Made cRecordingInfo::Read(FILE *f) private to avoid calls to it from outside
cRecordingInfo or cRecording (reported by Mika Laitio).

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 2.17 2011/03/20 10:33:30 kls Exp $ * $Id: recording.h 2.18 2011/04/03 11:14:37 kls Exp $
*/ */
#ifndef __RECORDING_H #ifndef __RECORDING_H
@ -57,6 +57,7 @@ private:
int lifetime; int lifetime;
char *fileName; char *fileName;
cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL); cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
bool Read(FILE *f);
void SetData(const char *Title, const char *ShortText, const char *Description); void SetData(const char *Title, const char *ShortText, const char *Description);
void SetAux(const char *Aux); void SetAux(const char *Aux);
public: public:
@ -72,7 +73,6 @@ public:
const char *Aux(void) const { return aux; } const char *Aux(void) const { return aux; }
double FramesPerSecond(void) const { return framesPerSecond; } double FramesPerSecond(void) const { return framesPerSecond; }
void SetFramesPerSecond(double FramesPerSecond); void SetFramesPerSecond(double FramesPerSecond);
bool Read(FILE *f);
bool Write(FILE *f, const char *Prefix = "") const; bool Write(FILE *f, const char *Prefix = "") const;
bool Read(void); bool Read(void);
bool Write(void) const; bool Write(void) const;