projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested use of Frame for video/audio content lengths.
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.cc
diff --git
a/src/lib/dcp_examiner.cc
b/src/lib/dcp_examiner.cc
index 9dbac14d0240bda279a826d25e4ef20bb82c5c64..a0d13a7224bb42d090d0f26922f0ee8f99ef50f7 100644
(file)
--- a/
src/lib/dcp_examiner.cc
+++ b/
src/lib/dcp_examiner.cc
@@
-81,7
+81,7
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
throw DCPError (_("Mismatched video sizes in DCP"));
}
throw DCPError (_("Mismatched video sizes in DCP"));
}
- _video_length +=
ContentTime::from_frames ((*i)->main_picture()->duration(), _video_frame_rate.get ()
);
+ _video_length +=
(*i)->main_picture()->duration(
);
}
if ((*i)->main_sound ()) {
}
if ((*i)->main_sound ()) {
@@
-99,7
+99,7
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
throw DCPError (_("Mismatched audio frame rates in DCP"));
}
throw DCPError (_("Mismatched audio frame rates in DCP"));
}
- _audio_length +=
ContentTime::from_frames ((*i)->main_sound()->duration(), _video_frame_rate.get ()
);
+ _audio_length +=
(*i)->main_sound()->duration(
);
}
if ((*i)->main_subtitle ()) {
}
if ((*i)->main_subtitle ()) {