From a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 Jul 2018 15:10:11 +0100 Subject: Tidy up after mass rename. --- src/lib/decoder.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/decoder.cc') 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 i, caption) { + BOOST_FOREACH (shared_ptr 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 i, caption) { + BOOST_FOREACH (shared_ptr i, text) { i->seek (); } } shared_ptr -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 (); } - return caption.front (); + return text.front (); } -- cgit v1.2.3