X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=52949a0989d83be7895f2117591a3dc7fedadc17;hp=2fddddc914dee09bee221af4c5b1fdc985d61c9b;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=cbd4450197a083bf58bda510e626f73ba583cb66 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 #include @@ -43,7 +43,7 @@ Decoder::position () const pos = audio->position(); } - BOOST_FOREACH (shared_ptr i, caption) { + BOOST_FOREACH (shared_ptr 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 i, caption) { + BOOST_FOREACH (shared_ptr i, caption) { i->seek (); } } -shared_ptr +shared_ptr Decoder::only_caption () const { DCPOMATIC_ASSERT (caption.size() < 2); if (caption.empty ()) { - return shared_ptr (); + return shared_ptr (); } return caption.front (); }