More automated renaming.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 2a249011a55f4d889383b8a76702d8daaf71893d..850cb0891d3af8918ee20a39dc01b49b9381b351 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -67,6 +67,7 @@ public:
        Content (boost::shared_ptr<const Film>, DCPTime);
        Content (boost::shared_ptr<const Film>, boost::filesystem::path);
        Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+       Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
        virtual ~Content () {}
 
        /** Examine the content to establish digest, frame rates and any other
@@ -181,10 +182,10 @@ public:
 
        boost::shared_ptr<VideoContent> video;
        boost::shared_ptr<AudioContent> audio;
-       std::list<boost::shared_ptr<CaptionContent> > caption;
+       std::list<boost::shared_ptr<TextContent> > caption;
 
-       boost::shared_ptr<CaptionContent> only_caption () const;
-       boost::shared_ptr<CaptionContent> caption_of_original_type (CaptionType type) const;
+       boost::shared_ptr<TextContent> only_caption () const;
+       boost::shared_ptr<TextContent> caption_of_original_type (TextType type) const;
 
        void signal_changed (int);