s/use_template/take_settings_from/g

13 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 909f89024..833462776 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -381,7 +381,7 @@ AudioContent::set_stream (AudioStreamPtr stream)
 }
 
 void
-AudioContent::use_template (shared_ptr<const AudioContent> c)
+AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
 {
 	_gain = c->_gain;
 	_delay = c->_delay;
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 1a2c2911d..e582bca20 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -48,7 +48,7 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
-	void use_template (boost::shared_ptr<const AudioContent> c);
+	void take_settings_from (boost::shared_ptr<const AudioContent> c);
 
 	AudioMapping mapping () const;
 	void set_mapping (AudioMapping);
diff --git a/src/lib/content.cc b/src/lib/content.cc
index f12464892..40f74fe9a 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -409,15 +409,15 @@ Content::add_properties (list<UserProperty>& p) const
 }
 
 void
-Content::use_template (shared_ptr<const Content> c)
+Content::take_settings_from (shared_ptr<const Content> c)
 {
 	if (video && c->video) {
-		video->use_template (c->video);
+		video->take_settings_from (c->video);
 	}
 	if (audio && c->audio) {
-		audio->use_template (c->audio);
+		audio->take_settings_from (c->audio);
 	}
 	if (subtitle && c->subtitle) {
-		subtitle->use_template (c->subtitle);
+		subtitle->take_settings_from (c->subtitle);
 	}
 }
diff --git a/src/lib/content.h b/src/lib/content.h
index d0a0466af..f0a2d0bdb 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -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.
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index fd0925935..43d6911f5 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -531,7 +531,7 @@ DCPContent::can_reference_subtitle (list<string>& why_not) const
 }
 
 void
-DCPContent::use_template (shared_ptr<const Content> c)
+DCPContent::take_settings_from (shared_ptr<const Content> c)
 {
 	shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
 	DCPOMATIC_ASSERT (dc);
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 434b61046..892b6aa73 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -67,7 +67,7 @@ public:
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
 	std::string identifier () const;
-	void use_template (boost::shared_ptr<const Content> c);
+	void take_settings_from (boost::shared_ptr<const Content> c);
 
 	void set_default_colour_conversion ();
 	std::list<DCPTime> reel_split_points () const;
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 92069cb60..64da0b1af 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -604,9 +604,9 @@ FFmpegContent::ffmpeg_audio_streams () const
 }
 
 void
-FFmpegContent::use_template (shared_ptr<const Content> c)
+FFmpegContent::take_settings_from (shared_ptr<const Content> c)
 {
-	Content::use_template (c);
+	Content::take_settings_from (c);
 
 	shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (c);
 	_filters = fc->_filters;
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index f6553df1c..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;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 392bb221b..f57b6299d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1087,7 +1087,7 @@ Film::add_content (shared_ptr<Content> c)
 		/* Take settings from the first piece of content of c's type in _template */
 		BOOST_FOREACH (shared_ptr<Content> i, _template_film->content()) {
 			if (typeid(i.get()) == typeid(c.get())) {
-				c->use_template (i);
+				c->take_settings_from (i);
 			}
 		}
 	}
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 37d431e1a..b603a455d 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -413,7 +413,7 @@ SubtitleContent::set_outline_width (int w)
 }
 
 void
-SubtitleContent::use_template (shared_ptr<const SubtitleContent> c)
+SubtitleContent::take_settings_from (shared_ptr<const SubtitleContent> c)
 {
 	_use = c->_use;
 	_burn = c->_burn;
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 7278b5408..2fc6d0fd6 100644
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -63,7 +63,7 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	std::string identifier () const;
-	void use_template (boost::shared_ptr<const SubtitleContent> c);
+	void take_settings_from (boost::shared_ptr<const SubtitleContent> c);
 
 	void add_font (boost::shared_ptr<Font> font);
 
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5ca48254c..d4e814624 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -529,7 +529,7 @@ VideoContent::set_fade_out (Frame t)
 }
 
 void
-VideoContent::use_template (shared_ptr<const VideoContent> c)
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
 	_colour_conversion = c->_colour_conversion;
 	_frame_type = c->_frame_type;
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 412d4d034..84b3d2268 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -57,7 +57,7 @@ public:
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
 	std::string identifier () const;
-	void use_template (boost::shared_ptr<const VideoContent> c);
+	void take_settings_from (boost::shared_ptr<const VideoContent> c);
 
 	Frame length () const {
 		boost::mutex::scoped_lock lm (_mutex);