projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
81d68db
)
Update for libdcp API changes.
author
Carl Hetherington
<cth@carlh.net>
Fri, 22 Mar 2019 14:51:08 +0000
(14:51 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 10 May 2019 22:43:42 +0000
(23:43 +0100)
src/lib/dcp_examiner.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcp_examiner.cc
b/src/lib/dcp_examiner.cc
index c70d8b2dbc9172966e400ce8451c9a0ed6168493..f44db84e1a765a9728a0a8212913e4e1b302599d 100644
(file)
--- a/
src/lib/dcp_examiner.cc
+++ b/
src/lib/dcp_examiner.cc
@@
-135,7
+135,7
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
throw DCPError (_("Mismatched video sizes in DCP"));
}
throw DCPError (_("Mismatched video sizes in DCP"));
}
- _video_length += i->main_picture()->duration();
+ _video_length += i->main_picture()->
actual_
duration();
}
if (i->main_sound ()) {
}
if (i->main_sound ()) {
@@
-160,7
+160,7
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
throw DCPError (_("Mismatched audio sample rates in DCP"));
}
throw DCPError (_("Mismatched audio sample rates in DCP"));
}
- _audio_length += i->main_sound()->duration();
+ _audio_length += i->main_sound()->
actual_
duration();
}
if (i->main_subtitle ()) {
}
if (i->main_subtitle ()) {
@@
-184,13
+184,13
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
}
if (i->main_picture()) {
}
if (i->main_picture()) {
- _reel_lengths.push_back (i->main_picture()->duration());
+ _reel_lengths.push_back (i->main_picture()->
actual_
duration());
} else if (i->main_sound()) {
} else if (i->main_sound()) {
- _reel_lengths.push_back (i->main_sound()->duration());
+ _reel_lengths.push_back (i->main_sound()->
actual_
duration());
} else if (i->main_subtitle()) {
} else if (i->main_subtitle()) {
- _reel_lengths.push_back (i->main_subtitle()->duration());
+ _reel_lengths.push_back (i->main_subtitle()->
actual_
duration());
} else if (!i->closed_captions().empty()) {
} else if (!i->closed_captions().empty()) {
- _reel_lengths.push_back (i->closed_captions().front()->duration());
+ _reel_lengths.push_back (i->closed_captions().front()->
actual_
duration());
}
}
}
}