Tidy up after mass rename.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 629672b7317d8e2252cab36f528f2e69b9329f57..c1812b9fd1dcb5fa014d84187237aa2d127f6228 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -27,7 +27,7 @@
 #include "content_factory.h"
 #include "video_content.h"
 #include "audio_content.h"
-#include "caption_content.h"
+#include "text_content.h"
 #include "exceptions.h"
 #include "film.h"
 #include "job.h"
@@ -437,33 +437,33 @@ Content::take_settings_from (shared_ptr<const Content> c)
                audio->take_settings_from (c->audio);
        }
 
-       list<shared_ptr<CaptionContent> >::iterator i = caption.begin ();
-       list<shared_ptr<CaptionContent> >::const_iterator j = c->caption.begin ();
-       while (i != caption.end() && j != c->caption.end()) {
+       list<shared_ptr<TextContent> >::iterator i = text.begin ();
+       list<shared_ptr<TextContent> >::const_iterator j = c->text.begin ();
+       while (i != text.end() && j != c->text.end()) {
                (*i)->take_settings_from (*j);
                ++i;
                ++j;
        }
 }
 
-shared_ptr<CaptionContent>
-Content::only_caption () const
+shared_ptr<TextContent>
+Content::only_text () const
 {
-       DCPOMATIC_ASSERT (caption.size() < 2);
-       if (caption.empty ()) {
-               return shared_ptr<CaptionContent> ();
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty ()) {
+               return shared_ptr<TextContent> ();
        }
-       return caption.front ();
+       return text.front ();
 }
 
-shared_ptr<CaptionContent>
-Content::caption_of_original_type (CaptionType type) const
+shared_ptr<TextContent>
+Content::text_of_original_type (TextType type) const
 {
-       BOOST_FOREACH (shared_ptr<CaptionContent> i, caption) {
+       BOOST_FOREACH (shared_ptr<TextContent> i, text) {
                if (i->original_type() == type) {
                        return i;
                }
        }
 
-       return shared_ptr<CaptionContent> ();
+       return shared_ptr<TextContent> ();
 }