Background-threaded hints including line length of CCAPs.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 1e594e136bd50ca22246c623565f16c98e3de2e4..23afa2243046d85db3ccbb9ffe823ea58d6905b2 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -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,7 +182,10 @@ public:
 
        boost::shared_ptr<VideoContent> video;
        boost::shared_ptr<AudioContent> audio;
-       boost::shared_ptr<CaptionContent> caption;
+       std::list<boost::shared_ptr<TextContent> > text;
+
+       boost::shared_ptr<TextContent> only_text () const;
+       boost::shared_ptr<TextContent> text_of_original_type (TextType type) const;
 
        void signal_changed (int);