diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-12 15:05:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-12 15:05:09 +0100 |
| commit | f9068dcbfbb09082e29e2a779ef1a7a2f6ee849e (patch) | |
| tree | 40054a96c986c133b2edb00c7c9a127d8d36a1a2 /src/lib/film.cc | |
| parent | bccc426dd0924bf6be63000835d7c86fd390ff59 (diff) | |
Rename split-by-video content slightly; fix referencing to multi-reel DCPs.
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 8cf468150..ace180d1d 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1297,16 +1297,18 @@ Film::reels () const case REELTYPE_SINGLE: p.push_back (DCPTimePeriod (DCPTime (), len)); break; - case REELTYPE_ONE_PER_VIDEO: + case REELTYPE_BY_VIDEO_CONTENT: { optional<DCPTime> last; BOOST_FOREACH (shared_ptr<Content> c, content ()) { shared_ptr<VideoContent> v = dynamic_pointer_cast<VideoContent> (c); if (v) { - if (last) { - p.push_back (DCPTimePeriod (last.get(), v->position ())); + BOOST_FOREACH (DCPTime t, v->reel_split_points()) { + if (last) { + p.push_back (DCPTimePeriod (last.get(), t)); + } + last = t; } - last = v->position (); } } if (last) { @@ -1330,4 +1332,3 @@ Film::reels () const return p; } - |