X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=942e9e533c8535b852af35df0b2108da5d8951fa;hb=0c4ec68f554996b4321cd0c0c6a80d9b6c9df321;hp=0fd503edd5134a8a809a579801e2b23bbab1381f;hpb=73654117144c6de0ec4efe39ddc88485df546cc9;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 0fd503edd..942e9e533 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,10 +25,14 @@
 #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"
 #include "compose.hpp"
+#include <dcp/locale_convert.h>
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -45,6 +49,7 @@ using std::max;
 using std::pair;
 using boost::shared_ptr;
 using dcp::raw_convert;
+using dcp::locale_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -133,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 ()));
@@ -229,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;
@@ -320,7 +327,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;
 }
 
@@ -365,7 +372,7 @@ Content::add_properties (list<UserProperty>& p) const
 				UserProperty (
 					UserProperty::VIDEO,
 					_("Frame rate"),
-					raw_convert<string> (_video_frame_rate.get(), 5),
+					locale_convert<string> (_video_frame_rate.get(), 5),
 					_("frames per second")
 					)
 				);
@@ -374,10 +381,24 @@ Content::add_properties (list<UserProperty>& p) const
 				UserProperty (
 					UserProperty::GENERAL,
 					_("Prepared for video frame rate"),
-					raw_convert<string> (_video_frame_rate.get(), 5),
+					locale_convert<string> (_video_frame_rate.get(), 5),
 					_("frames per second")
 					)
 				);
 		}
 	}
 }
+
+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);
+	}
+}