#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>
pos = audio->position();
}
- BOOST_FOREACH (shared_ptr<CaptionDecoder> i, caption) {
+ BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
if (!i->ignore() && (!pos || i->position() < *pos)) {
pos = i->position();
}
if (audio) {
audio->seek ();
}
- BOOST_FOREACH (shared_ptr<CaptionDecoder> i, caption) {
+ BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
i->seek ();
}
}
-shared_ptr<CaptionDecoder>
-Decoder::only_caption () const
+shared_ptr<TextDecoder>
+Decoder::only_text () const
{
- DCPOMATIC_ASSERT (caption.size() < 2);
- if (caption.empty ()) {
- return shared_ptr<CaptionDecoder> ();
+ DCPOMATIC_ASSERT (text.size() < 2);
+ if (text.empty ()) {
+ return shared_ptr<TextDecoder> ();
}
- return caption.front ();
+ return text.front ();
}