summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-12-05 10:37:41 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-12-05 10:37:41 +0100
commit41f94447d6252765bb40df1740054af55822de80 (patch)
tree018a3c21b2bf7f91f95e40b167abd151af9f1aea
parent76a9b09e257b52bc2cbddd8a9a1c209eb9ea70e0 (diff)
downloadvdr-41f94447d6252765bb40df1740054af55822de80.tar.gz
vdr-41f94447d6252765bb40df1740054af55822de80.tar.bz2
When regenerating the index of a recording, the frame rate stored in the info file is now automatically fixed if it differs from the value detected by the frame detector
-rw-r--r--HISTORY3
-rw-r--r--recording.c10
2 files changed, 12 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 419ab4f6..f06b796d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7387,3 +7387,6 @@ Video Disk Recorder Revision History
- The new option "Setup/Replay/Pause on mark set" can be used to activate automatically
going into Pause mode if an editing mark is set during replay (suggested by Andre
Weidemann).
+- When regenerating the index of a recording, the frame rate stored in the info file
+ is now automatically fixed if it differs from the value detected by the frame
+ detector.
diff --git a/recording.c b/recording.c
index 08a5e4d0..edb86c51 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 2.75 2012/11/26 09:39:59 kls Exp $
+ * $Id: recording.c 2.76 2012/12/05 10:32:00 kls Exp $
*/
#include "recording.h"
@@ -1642,6 +1642,14 @@ void cIndexFileGenerator::Action(void)
}
if (IndexFileComplete) {
if (IndexFileWritten) {
+ cRecordingInfo RecordingInfo(recordingName);
+ if (RecordingInfo.Read()) {
+ if (FrameDetector.FramesPerSecond() > 0 && !DoubleEqual(RecordingInfo.FramesPerSecond(), FrameDetector.FramesPerSecond())) {
+ RecordingInfo.SetFramesPerSecond(FrameDetector.FramesPerSecond());
+ RecordingInfo.Write();
+ Recordings.UpdateByName(recordingName);
+ }
+ }
Skins.QueueMessage(mtInfo, tr("Index file regeneration complete"));
return;
}