diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-23 15:10:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-23 15:10:11 +0100 |
| commit | a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb (patch) | |
| tree | 6cd463704f413259516e2888704272a371a108a6 /src/lib/playlist.cc | |
| parent | df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc (diff) | |
Tidy up after mass rename.
Diffstat (limited to 'src/lib/playlist.cc')
| -rw-r--r-- | src/lib/playlist.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index a55893291..c830e5e1e 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -135,7 +135,7 @@ Playlist::maybe_sequence () DCPTime next; BOOST_FOREACH (shared_ptr<Content> i, _content) { - if (i->caption.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { + if (i->text.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { continue; } @@ -156,7 +156,7 @@ Playlist::video_identifier () const BOOST_FOREACH (shared_ptr<const Content> i, _content) { bool burn = false; - BOOST_FOREACH (shared_ptr<TextContent> j, i->caption) { + BOOST_FOREACH (shared_ptr<TextContent> j, i->text) { if (j->burn()) { burn = true; } @@ -368,11 +368,11 @@ Playlist::video_end () const } DCPTime -Playlist::caption_end () const +Playlist::text_end () const { DCPTime end; BOOST_FOREACH (shared_ptr<Content> i, _content) { - if (!i->caption.empty ()) { + if (!i->text.empty ()) { end = max (end, i->end ()); } } |