diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-11 11:12:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-11 11:12:24 +0100 |
| commit | e6a4cb97059f9b4683b00da893dc07bef59ad1e4 (patch) | |
| tree | 12e9764d160c17a7c3458efe12b5abdd317a3107 /src | |
| parent | cfc7d4edcc20fd96f7f01d52c1a3fd2a69294f68 (diff) | |
| parent | ab2772c73140786ed167e97b527647c342d5a56f (diff) | |
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/reel_writer.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index a386d19b7..064b169b7 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -439,6 +439,8 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr shared_ptr<dcp::ReelPictureAsset> reel_picture_asset; + LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count); + if (_picture_asset) { /* We have made a picture asset of our own. Put it into the reel */ shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (_picture_asset); @@ -464,8 +466,6 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr } } - LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count); - Frame const period_duration = _period.duration().frames_round(_film->video_frame_rate()); DCPOMATIC_ASSERT (reel_picture_asset); @@ -488,9 +488,13 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr /* We have made a sound asset of our own. Put it into the reel */ reel_sound_asset.reset (new dcp::ReelSoundAsset (_sound_asset, 0)); } else { + LOG_GENERAL ("no sound asset of our own; look through %1", refs.size()); /* We don't have a sound asset of our own; hopefully we have one to reference */ BOOST_FOREACH (ReferencedReelAsset j, refs) { shared_ptr<dcp::ReelSoundAsset> k = dynamic_pointer_cast<dcp::ReelSoundAsset> (j.asset); + if (k) { + LOG_GENERAL ("candidate sound asset period is %1-%2", j.period.from.get(), j.period.to.get()); + } if (k && j.period == _period) { reel_sound_asset = k; /* If we have a hash for this asset in the CPL, assume that it is correct */ |