X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=af85e0ff08d17fcbf7fd4111ce27988d9fe405dd;hb=5b3e3df6c9352e31dd932a5af215eabbf2cf27c8;hp=aa382d68b9e5f53fa233e70a6d4925ae65a73b9e;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index aa382d68b..af85e0ff0 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,10 +28,12 @@
 #include "film.h"
 #include "safe_stringstream.h"
 #include "job.h"
+#include "compose.hpp"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -40,6 +42,7 @@ using std::list;
 using std::cout;
 using std::vector;
 using std::max;
+using std::pair;
 using boost::shared_ptr;
 
 int const ContentProperty::PATH = 400;
@@ -87,9 +90,9 @@ Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
 		_paths.push_back ((*i)->content ());
 	}
 	_digest = node->optional_string_child ("Digest").get_value_or ("X");
-	_position = DCPTime (node->number_child<double> ("Position"));
-	_trim_start = DCPTime (node->number_child<double> ("TrimStart"));
-	_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
+	_position = DCPTime (node->number_child<DCPTime::Type> ("Position"));
+	_trim_start = ContentTime (node->number_child<ContentTime::Type> ("TrimStart"));
+	_trim_end = ContentTime (node->number_child<ContentTime::Type> ("TrimEnd"));
 }
 
 Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
@@ -100,11 +103,11 @@ Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
 	, _change_signals_frequent (false)
 {
 	for (size_t i = 0; i < c.size(); ++i) {
-		if (i > 0 && c[i]->trim_start() > DCPTime()) {
+		if (i > 0 && c[i]->trim_start() > ContentTime ()) {
 			throw JoinError (_("Only the first piece of content to be joined can have a start trim."));
 		}
 
-		if (i < (c.size() - 1) && c[i]->trim_end () > DCPTime()) {
+		if (i < (c.size() - 1) && c[i]->trim_end () > ContentTime ()) {
 			throw JoinError (_("Only the last piece of content to be joined can have an end trim."));
 		}
 
@@ -171,7 +174,7 @@ Content::set_position (DCPTime p)
 }
 
 void
-Content::set_trim_start (DCPTime t)
+Content::set_trim_start (ContentTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -182,7 +185,7 @@ Content::set_trim_start (DCPTime t)
 }
 
 void
-Content::set_trim_end (DCPTime t)
+Content::set_trim_end (ContentTime t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -220,11 +223,11 @@ Content::technical_summary () const
 DCPTime
 Content::length_after_trim () const
 {
-	return max (DCPTime (), full_length() - trim_start() - trim_end());
+	return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ())));
 }
 
-/** @return string which includes everything about how this content affects
- *  its playlist.
+/** @return string which changes when something about this content changes which affects
+ *  the appearance of its video.
  */
 string
 Content::identifier () const
@@ -273,3 +276,22 @@ Content::path_summary () const
 
 	return s;
 }
+
+/** @return a list of properties that might be interesting to the user; first string is the property name,
+ *  second is the value.
+ */
+list<pair<string, string> >
+Content::properties () const
+{
+	list<pair<string, string> > p;
+	add_properties (p);
+	return p;
+}
+
+shared_ptr<const Film>
+Content::film () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	return film;
+}