X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=d9020ac018dcce2ab2bcda5df638d74d1cc9653f;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=91caac27cd8ab4fa785c5fb3b0c1f19fba6fb2a3;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 91caac27c..d9020ac01 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -55,7 +55,7 @@ public:
 	}
 
 	void examine (boost::shared_ptr<Job>);
-	void use_template (boost::shared_ptr<const Content> c);
+	void take_settings_from (boost::shared_ptr<const Content> c);
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
@@ -91,9 +91,6 @@ public:
 		return _first_video;
 	}
 
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
 	void signal_subtitle_stream_changed ();
 
 private: