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

diff --git a/src/lib/content.h b/src/lib/content.h
index d0a0466af..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.
@@ -166,6 +166,7 @@ public:
 	}
 
 	void set_video_frame_rate (double r);
+	void unset_video_frame_rate ();
 
 	double active_video_frame_rate () const;
 
@@ -181,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);