diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | recording.c | 8 | ||||
| -rw-r--r-- | recording.h | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6e5baf5e..b87d0a42 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -823,6 +823,8 @@ Andreas Brachold <vdr04@deltab.de> the actual plugin library files from this version of VDR for making files and directories created with rights according to the shell's umask settings + for reporting that there are empty info.vdr files created if there is no EPG + info available Manuel Hartl <icecep@gmx.net> for suggesting to extend the logging info when starting/stopping timers @@ -3683,3 +3683,6 @@ Video Disk Recorder Revision History - Fixed handling EPG data for time shifted events (thanks to Marco Schlüßler). - Increased the default value for 'Min. user inactivity' to 300 minutes (suggested by Helmut Auer). +- Now storing the channel id in the info.vdr file even if there is no EPG info + available (thanks to Andreas Brachold for reporting that there are empty info.vdr + files created in that case). diff --git a/recording.c b/recording.c index 081f9e61..f9c424cd 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 1.110 2005/08/06 09:53:21 kls Exp $ + * $Id: recording.c 1.111 2005/08/13 14:00:48 kls Exp $ */ #include "recording.h" @@ -220,11 +220,11 @@ void cResumeFile::Delete(void) // --- cRecordingInfo -------------------------------------------------------- -cRecordingInfo::cRecordingInfo(const cEvent *Event) +cRecordingInfo::cRecordingInfo(tChannelID ChannelID, const cEvent *Event) { + channelID = ChannelID; if (Event) { event = Event; - channelID = event->ChannelID(); ownEvent = NULL; } else @@ -424,7 +424,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event) priority = Timer->Priority(); lifetime = Timer->Lifetime(); // handle info: - info = new cRecordingInfo(Event); + info = new cRecordingInfo(Timer->Channel()->GetChannelID(), Event); // this is a somewhat ugly hack to get the 'summary' information from the // timer into the recording info, but it saves us from having to actually // copy the entire event data: diff --git a/recording.h b/recording.h index 0adb036e..05c34e28 100644 --- a/recording.h +++ b/recording.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.h 1.38 2005/05/28 09:34:07 kls Exp $ + * $Id: recording.h 1.39 2005/08/13 14:09:50 kls Exp $ */ #ifndef __RECORDING_H @@ -40,7 +40,7 @@ private: tChannelID channelID; const cEvent *event; cEvent *ownEvent; - cRecordingInfo(const cEvent *Event = NULL); + cRecordingInfo(tChannelID ChannelID = tChannelID::InvalidID, const cEvent *Event = NULL); void SetData(const char *Title, const char *ShortText, const char *Description); public: ~cRecordingInfo(); |