X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=23afa2243046d85db3ccbb9ffe823ea58d6905b2;hb=3006dde72c92356165ef841910368d0dae27ddbe;hp=f8b5493c0eb400d4e32c995d83ce8733e90903e4;hpb=73654117144c6de0ec4efe39ddc88485df546cc9;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index f8b5493c0..23afa2243 100644
--- 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.
 
@@ -63,7 +63,7 @@ public:
 class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
 {
 public:
-	Content (boost::shared_ptr<const Film>);
+	explicit Content (boost::shared_ptr<const Film>);
 	Content (boost::shared_ptr<const Film>, DCPTime);
 	Content (boost::shared_ptr<const Film>, boost::filesystem::path);
 	Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
@@ -76,6 +76,8 @@ public:
 	 */
 	virtual void examine (boost::shared_ptr<Job> job);
 
+	virtual void take_settings_from (boost::shared_ptr<const Content> c);
+
 	/** @return Quick one-line summary of the content, as will be presented in the
 	 *  film editor.
 	 */
@@ -86,7 +88,7 @@ public:
 	 */
 	virtual std::string technical_summary () const;
 
-	virtual void as_xml (xmlpp::Node *) const;
+	virtual void as_xml (xmlpp::Node *, bool with_paths) const;
 	virtual DCPTime full_length () const = 0;
 	virtual std::string identifier () const;
 	/** @return points at which to split this content when
@@ -97,6 +99,7 @@ public:
 	boost::shared_ptr<Content> clone () const;
 
 	void set_path (boost::filesystem::path);
+	void set_paths (std::vector<boost::filesystem::path> paths);
 
 	std::string path_summary () const;
 
@@ -119,7 +122,7 @@ public:
 
 	/** @return Digest of the content's file(s).  Note: this is
 	 *  not a complete MD5-or-whatever hash, but a sort of poor
-	 *  man's version (see comments in ::examine).
+	 *  man's version (see comments in examine()).
 	 */
 	std::string digest () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -163,6 +166,7 @@ public:
 	}
 
 	void set_video_frame_rate (double r);
+	void unset_video_frame_rate ();
 
 	double active_video_frame_rate () const;
 
@@ -178,7 +182,10 @@ public:
 
 	boost::shared_ptr<VideoContent> video;
 	boost::shared_ptr<AudioContent> audio;
-	boost::shared_ptr<SubtitleContent> subtitle;
+	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);