diff options
Diffstat (limited to 'src/lib/decoder.cc')
| -rw-r--r-- | src/lib/decoder.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 2fddddc91..52949a098 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -21,7 +21,7 @@ #include "decoder.h" #include "video_decoder.h" #include "audio_decoder.h" -#include "caption_decoder.h" +#include "text_decoder.h" #include <boost/optional.hpp> #include <iostream> @@ -43,7 +43,7 @@ Decoder::position () const pos = audio->position(); } - BOOST_FOREACH (shared_ptr<CaptionDecoder> i, caption) { + BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) { 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<CaptionDecoder> i, caption) { + BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) { i->seek (); } } -shared_ptr<CaptionDecoder> +shared_ptr<TextDecoder> Decoder::only_caption () const { DCPOMATIC_ASSERT (caption.size() < 2); if (caption.empty ()) { - return shared_ptr<CaptionDecoder> (); + return shared_ptr<TextDecoder> (); } return caption.front (); } |