X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=21b04c6493aea2f3d2ee0410a788b39a8dc85d04;hb=9fc3a67c727896d2170888ae60c9745ebbfdca95;hp=a27032e9c135efaed177a39b3594d91a3937e6a9;hpb=3412af70b950dcdc604413ef05c26becda6da789;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index a27032e9c..21b04c649 100644
--- 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"
@@ -233,7 +236,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;
@@ -286,6 +289,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
 {
@@ -324,7 +334,7 @@ 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()));
+	t.push_back (position().ceil (film()->video_frame_rate()));
 	return t;
 }
 
@@ -385,3 +395,17 @@ Content::add_properties (list<UserProperty>& p) const
 		}
 	}
 }
+
+void
+Content::use_template (shared_ptr<const Content> c)
+{
+	if (video && c->video) {
+		video->use_template (c->video);
+	}
+	if (audio && c->audio) {
+		audio->use_template (c->audio);
+	}
+	if (subtitle && c->subtitle) {
+		subtitle->use_template (c->subtitle);
+	}
+}