summaryrefslogtreecommitdiff
path: root/src/lib/reel_writer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-03-19 21:37:19 +0000
committerCarl Hetherington <cth@carlh.net>2019-05-10 23:43:42 +0100
commit5e3ee55930334c7e0a5a398918794bff955383d4 (patch)
tree91efb4296951c5730577b161b4e5330e11630e98 /src/lib/reel_writer.cc
parent7f97799c4cfea1544ef85a8a421c506605dba204 (diff)
Update for libdcp API changes.
Diffstat (limited to 'src/lib/reel_writer.cc')
-rw-r--r--src/lib/reel_writer.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 9be4ce571..f5fe87248 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -408,10 +408,10 @@ maybe_add_text (
}
if (reel_asset) {
- if (reel_asset->duration() != period_duration) {
+ if (reel_asset->actual_duration() != period_duration) {
throw ProgrammingError (
__FILE__, __LINE__,
- String::compose ("%1 vs %2", reel_asset->duration(), period_duration)
+ String::compose ("%1 vs %2", reel_asset->actual_duration(), period_duration)
);
}
reel->add (reel_asset);
@@ -460,7 +460,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
if (reel_picture_asset->duration() != period_duration) {
throw ProgrammingError (
__FILE__, __LINE__,
- String::compose ("%1 vs %2", reel_picture_asset->duration(), period_duration)
+ String::compose ("%1 vs %2", reel_picture_asset->actual_duration(), period_duration)
);
}
reel->add (reel_picture_asset);
@@ -490,26 +490,26 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
}
DCPOMATIC_ASSERT (reel_sound_asset);
- if (reel_sound_asset->duration() != period_duration) {
+ if (reel_sound_asset->actual_duration() != period_duration) {
LOG_ERROR (
"Reel sound asset has length %1 but reel period is %2",
- reel_sound_asset->duration(),
+ reel_sound_asset->actual_duration(),
period_duration
);
- if (reel_sound_asset->duration() != period_duration) {
+ if (reel_sound_asset->actual_duration() != period_duration) {
throw ProgrammingError (
__FILE__, __LINE__,
- String::compose ("%1 vs %2", reel_sound_asset->duration(), period_duration)
+ String::compose ("%1 vs %2", reel_sound_asset->actual_duration(), period_duration)
);
}
}
reel->add (reel_sound_asset);
- maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
+ maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->actual_duration(), reel, refs, fonts, _film, _period);
for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) {
shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
- i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period
+ i->second, reel_picture_asset->actual_duration(), reel, refs, fonts, _film, _period
);
a->set_annotation_text (i->first.name);
a->set_language (i->first.language);