diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-29 01:24:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-29 11:58:18 +0100 |
| commit | 9561890c51af705664ae4eeab09e73e978768a0c (patch) | |
| tree | 412e5b7dfd7f06d417c04414d70b5d4a913340e7 /src/lib | |
| parent | c78d83c56bdec4935efd7a7d2f758165873d1137 (diff) | |
Check for unassigned text tracks.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 086d12e63..93e7aa1c0 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1644,8 +1644,10 @@ Film::closed_caption_tracks () const list<DCPTextTrack> tt; BOOST_FOREACH (shared_ptr<Content> i, content()) { BOOST_FOREACH (shared_ptr<TextContent> j, i->text) { - if (j->type() == TEXT_CLOSED_CAPTION && j->dcp_track() && find(tt.begin(), tt.end(), j->dcp_track().get()) == tt.end()) { - tt.push_back (j->dcp_track().get()); + /* XXX: Empty DCPTextTrack ends up being a magic value here */ + DCPTextTrack dtt = j->dcp_track().get_value_or(DCPTextTrack()); + if (j->type() == TEXT_CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) { + tt.push_back (dtt); } } } |