X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=63d03fd713121cdf3fadebe17390158e32fa9284;hb=d7ac100c0eb1b5efdcfbec59be870fd869252840;hp=519ff8907478d4459ac2ed1723098a5565d957e5;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;p=dcpomatic.git

diff --git a/src/lib/content.h b/src/lib/content.h
index 519ff8907..63d03fd71 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -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,7 +76,7 @@ public:
 	 */
 	virtual void examine (boost::shared_ptr<Job> job);
 
-	virtual void use_template (boost::shared_ptr<const Content> c);
+	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.
@@ -99,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;
 
@@ -121,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);
@@ -165,6 +166,7 @@ public:
 	}
 
 	void set_video_frame_rate (double r);
+	void unset_video_frame_rate ();
 
 	double active_video_frame_rate () const;
 
@@ -180,7 +182,7 @@ public:
 
 	boost::shared_ptr<VideoContent> video;
 	boost::shared_ptr<AudioContent> audio;
-	boost::shared_ptr<SubtitleContent> subtitle;
+	boost::shared_ptr<TextContent> subtitle;
 
 	void signal_changed (int);