s/use_template/take_settings_from/g

[dcpomatic.git] / src / lib / content.cc

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9083635f242eaea3f5aefe5445c1d25ccb6b8921..40f74fe9aae75866aa146286541e5847ca6dcaaf 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,6 +25,9 @@
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
+#include "video_content.h"
+#include "audio_content.h"
+#include "subtitle_content.h"
 #include "exceptions.h"
 #include "film.h"
 #include "job.h"
@@ -135,12 +138,14 @@ Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
 }
 
 void
-Content::as_xml (xmlpp::Node* node) const
+Content::as_xml (xmlpp::Node* node, bool with_paths) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
-               node->add_child("Path")->add_child_text (i->string ());
+       if (with_paths) {
+               for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
+                       node->add_child("Path")->add_child_text (i->string ());
+               }
        }
        node->add_child("Digest")->add_child_text (_digest);
        node->add_child("Position")->add_child_text (raw_convert<string> (_position.get ()));
@@ -185,6 +190,11 @@ Content::signal_changed (int p)
 void
 Content::set_position (DCPTime p)
 {
+       /* video content can modify its position */
+       if (video) {
+               video->modify_position (p);
+       }
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                if (p == _position) {
@@ -200,6 +210,11 @@ Content::set_position (DCPTime p)
 void
 Content::set_trim_start (ContentTime t)
 {
+       /* video content can modify its start trim */
+       if (video) {
+               video->modify_trim_start (t);
+       }
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _trim_start = t;
@@ -231,7 +246,7 @@ Content::clone () const
        /* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
        xmlpp::Document doc;
        xmlpp::Node* node = doc.create_root_node ("Content");
-       as_xml (node);
+       as_xml (node, true);
 
        /* notes is unused here (we assume) */
        list<string> notes;
@@ -284,6 +299,13 @@ Content::set_path (boost::filesystem::path path)
        signal_changed (ContentProperty::PATH);
 }
 
+void
+Content::set_paths (vector<boost::filesystem::path> paths)
+{
+       _paths = paths;
+       signal_changed (ContentProperty::PATH);
+}
+
 string
 Content::path_summary () const
 {
@@ -321,8 +343,10 @@ list<DCPTime>
 Content::reel_split_points () const
 {
        list<DCPTime> t;
-       /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */
-       t.push_back (position().round_up (film()->video_frame_rate()));
+       /* This is only called for video content and such content has its position forced
+          to start on a frame boundary.
+       */
+       t.push_back (position());
        return t;
 }
 
@@ -383,3 +407,17 @@ Content::add_properties (list<UserProperty>& p) const
                }
        }
 }
+
+void
+Content::take_settings_from (shared_ptr<const Content> c)
+{
+       if (video && c->video) {
+               video->take_settings_from (c->video);
+       }
+       if (audio && c->audio) {
+               audio->take_settings_from (c->audio);
+       }
+       if (subtitle && c->subtitle) {
+               subtitle->take_settings_from (c->subtitle);
+       }
+}