X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=0c89685313337b69e1584df648240bd0c7c3d71f;hb=387304bc9147933b68eda2b38ba8cac0d250e87e;hp=a5b5f37e13f967a9c4845d707000f19049c140cb;hpb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;p=dcpomatic.git

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index a5b5f37e1..0c8968531 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -17,19 +17,21 @@
 
 */
 
-#include <dcp/dcp.h>
-#include <dcp/exceptions.h>
 #include "dcp_content.h"
 #include "dcp_examiner.h"
 #include "job.h"
 #include "film.h"
 #include "config.h"
 #include "compose.hpp"
+#include <dcp/dcp.h>
+#include <dcp/exceptions.h>
+#include <iterator>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
+using std::distance;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -42,10 +44,11 @@ DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, SubtitleContent (f)
 	, _has_subtitles (false)
 	, _encrypted (false)
-	, _directory (p)
 	, _kdm_valid (false)
 {
 	read_directory (p);
+	/* Default to no colour conversion for DCPs */
+	unset_colour_conversion (false);
 }
 
 DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
@@ -56,7 +59,6 @@ DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int v
 {
 	_name = node->string_child ("Name");
 	_has_subtitles = node->bool_child ("HasSubtitles");
-	_directory = node->string_child ("Directory");
 	_encrypted = node->bool_child ("Encrypted");
 	if (node->optional_node_child ("KDM")) {
 		_kdm = dcp::EncryptedKDM (node->string_child ("KDM"));
@@ -128,7 +130,6 @@ DCPContent::as_xml (xmlpp::Node* node) const
 	node->add_child("Name")->add_child_text (_name);
 	node->add_child("HasSubtitles")->add_child_text (_has_subtitles ? "1" : "0");
 	node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
-	node->add_child("Directory")->add_child_text (_directory.string ());
 	if (_kdm) {
 		node->add_child("KDM")->add_child_text (_kdm->as_xml ());
 	}
@@ -139,8 +140,9 @@ DCPTime
 DCPContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	return DCPTime (video_length (), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
+	DCPOMATIC_ASSERT (film);
+	FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ());
+	return DCPTime::from_frames (rint (video_length () * frc.factor ()), film->video_frame_rate ());
 }
 
 string
@@ -160,3 +162,19 @@ DCPContent::can_be_played () const
 {
 	return !_encrypted || _kdm_valid;
 }
+
+boost::filesystem::path
+DCPContent::directory () const
+{
+	optional<size_t> smallest;
+	boost::filesystem::path dir;
+	for (size_t i = 0; i < number_of_paths(); ++i) {
+		boost::filesystem::path const p = path (i).parent_path ();
+		size_t const d = distance (p.begin(), p.end());
+		if (!smallest || d < smallest.get ()) {
+			dir = p;
+		}
+	}
+
+	return dir;
+}