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/decoder.cc | |
| parent | df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc (diff) | |
Tidy up after mass rename.
Diffstat (limited to 'src/lib/decoder.cc')
| -rw-r--r-- | src/lib/decoder.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 52949a098..6078141dc 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -43,7 +43,7 @@ Decoder::position () const pos = audio->position(); } - BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) { + BOOST_FOREACH (shared_ptr<TextDecoder> i, text) { if (!i->ignore() && (!pos || i->position() < *pos)) { pos = i->position(); } @@ -61,17 +61,17 @@ Decoder::seek (ContentTime, bool) if (audio) { audio->seek (); } - BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) { + BOOST_FOREACH (shared_ptr<TextDecoder> i, text) { i->seek (); } } shared_ptr<TextDecoder> -Decoder::only_caption () const +Decoder::only_text () const { - DCPOMATIC_ASSERT (caption.size() < 2); - if (caption.empty ()) { + DCPOMATIC_ASSERT (text.size() < 2); + if (text.empty ()) { return shared_ptr<TextDecoder> (); } - return caption.front (); + return text.front (); } |