X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=2e4e77f8d6e6fcbcd3f5eb65bb0f99eab5aed818;hb=78cece0461b94e5ffc4417f0228e0ad528ad8efe;hp=95713d323c47b032ab17d7fc132699ca7ba3145b;hpb=ebc36d56736997b40a51301a8746c6727cc34b1f;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 95713d323..2e4e77f8d 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,12 +25,15 @@
 #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 "safe_stringstream.h"
 #include "job.h"
 #include "compose.hpp"
-#include "raw_convert.h"
+#include <dcp/locale_convert.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
@@ -45,6 +48,9 @@ using std::vector;
 using std::max;
 using std::pair;
 using boost::shared_ptr;
+using boost::optional;
+using dcp::raw_convert;
+using dcp::locale_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -133,12 +139,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 ()));
@@ -183,6 +191,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) {
@@ -198,6 +211,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;
@@ -229,7 +247,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;
@@ -254,14 +272,12 @@ Content::length_after_trim () const
 string
 Content::identifier () const
 {
-	SafeStringStream s;
-
-	s << Content::digest()
-	  << "_" << position().get()
-	  << "_" << trim_start().get()
-	  << "_" << trim_end().get();
-
-	return s.str ();
+	char buffer[256];
+	snprintf (
+		buffer, sizeof(buffer), "%s_%" PRId64 "_%" PRId64 "_%" PRId64,
+		Content::digest().c_str(), position().get(), trim_start().get(), trim_end().get()
+		);
+	return buffer;
 }
 
 bool
@@ -284,6 +300,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 +344,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;
 }
 
@@ -335,6 +360,23 @@ Content::set_video_frame_rate (double r)
 	}
 
 	signal_changed (ContentProperty::VIDEO_FRAME_RATE);
+
+	/* Make sure things are still on frame boundaries */
+	if (video) {
+		set_position (position());
+		set_trim_start (trim_start());
+	}
+}
+
+void
+Content::unset_video_frame_rate ()
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_video_frame_rate = optional<double>();
+	}
+
+	signal_changed (ContentProperty::VIDEO_FRAME_RATE);
 }
 
 double
@@ -367,7 +409,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")
 					)
 				);
@@ -376,10 +418,25 @@ 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")
 					)
 				);
 		}
 	}
 }
+
+/** Take settings from the given content if it is of the correct type */
+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);
+	}
+}