More automated renaming.

[dcpomatic.git] / src / lib / decoder.cc

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 2fddddc914dee09bee221af4c5b1fdc985d61c9b..52949a0989d83be7895f2117591a3dc7fedadc17 100644 (file)
--- 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 ();
 }