s/use_template/take_settings_from/g

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 909f890242dd68fbc91c5461c722a64c0456e16e..8334627762ffcd02856a602471f388ca6532ad26 100644 (file)
--- 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 1a2c2911deea6041bf6ba299109d63e7d7ab4a75..e582bca2092c101e66f4243bb2c7e6c25544af31 100644 (file)
--- 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 f1246489292f560f08a90e960ed4c0da5df4f77a..40f74fe9aae75866aa146286541e5847ca6dcaaf 100644 (file)
--- 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 d0a0466af5c58880eb7b1cd82319987c38233f75..f0a2d0bdb1fe79ca05008b2eababe83e13ac69ee 100644 (file)
--- 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 fd092593514f76401699efcbbfe62b5f55c7817d..43d6911f57412d2f412623e36365fdaacad51f3b 100644 (file)
--- 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 434b6104668a70ddb52905bb9a257563efbe62a6..892b6aa735f7cb3fc589dc416400ede1defeab90 100644 (file)
--- 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 92069cb601c04dd2e08000afa317e3c6cad12e7e..64da0b1af0b71d2f8e8d6909655a8ed08a896e41 100644 (file)
--- 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 f6553df1c47e53c3b1b65be5ca9045691ffaca0d..d9020ac018dcce2ab2bcda5df638d74d1cc9653f 100644 (file)
--- 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 392bb221b021efc1fe16e44c01d53b7aa9df2735..f57b6299dfd551cb99756ee4251fccf96747654c 100644 (file)
--- 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 37d431e1aa1701234cc0827c206ca559de0900e1..b603a455da72edf091e5e9507eda24e14f084e86 100644 (file)
--- 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 7278b540892681fecff8a9d038c04970b3a79700..2fc6d0fd6f89d3b00ee03d4134df9055232c2de1 100644 (file)
--- 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 5ca48254cd694f40c4cf57d70d85dad3658360cb..d4e814624de8c949a9cd790de392fa536a4986ba 100644 (file)
--- 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 412d4d034d96e032676d96c5baf386da1bca8aac..84b3d2268bbd2006ed376f3f504edc68b21d3e2a 100644 (file)
--- 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);