X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=5fb9d324ac8142953edfafe33ab2c4759af59068;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=11bf63f11eb1c8e0761bd8d9491ab2076e61ff2c;hpb=fe8251bb73765b459042b0fa841dae2d440487fd;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 11bf63f11..5fb9d324a 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -48,10 +48,11 @@ using std::cout;
 using std::vector;
 using std::max;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using dcp::raw_convert;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -91,7 +92,7 @@ Content::Content (cxml::ConstNodePtr node)
 	: _change_signals_frequent (false)
 {
 	list<cxml::NodePtr> path_children = node->node_children ("Path");
-	BOOST_FOREACH (cxml::NodePtr i, path_children) {
+	for (auto i: path_children) {
 		_paths.push_back (i->content());
 		optional<time_t> const mod = i->optional_number_attribute<time_t>("mtime");
 		if (mod) {
@@ -191,7 +192,7 @@ Content::examine (shared_ptr<const Film>, shared_ptr<Job> job)
 	_digest = d;
 
 	_last_write_times.clear ();
-	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+	for (auto i: _paths) {
 		_last_write_times.push_back (boost::filesystem::last_write_time(i));
 	}
 }
@@ -205,13 +206,13 @@ Content::signal_change (ChangeType c, int p)
 		} else {
 			emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent));
 		}
-	} catch (boost::bad_weak_ptr) {
+	} catch (std::bad_weak_ptr &) {
 		/* This must be during construction; never mind */
 	}
 }
 
 void
-Content::set_position (shared_ptr<const Film> film, DCPTime p)
+Content::set_position (shared_ptr<const Film> film, DCPTime p, bool force_emit)
 {
 	/* video and audio content can modify its position */
 
@@ -219,7 +220,13 @@ Content::set_position (shared_ptr<const Film> film, DCPTime p)
 		video->modify_position (film, p);
 	}
 
-	if (audio) {
+	/* Only allow the audio to modify if we have no video;
+	   sometimes p can't be on an integer video AND audio frame,
+	   and in these cases we want the video constraint to be
+	   satisfied since (I think) the audio code is better able to
+	   cope.
+	*/
+	if (!video && audio) {
 		audio->modify_position (film, p);
 	}
 
@@ -227,7 +234,7 @@ Content::set_position (shared_ptr<const Film> film, DCPTime p)
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		if (p == _position) {
+		if (p == _position && !force_emit) {
 			cc.abort ();
 			return;
 		}
@@ -245,7 +252,8 @@ Content::set_trim_start (ContentTime t)
 		video->modify_trim_start (t);
 	}
 
-	if (audio) {
+	/* See note in ::set_position */
+	if (!video && audio) {
 		audio->modify_trim_start (t);
 	}
 
@@ -295,7 +303,11 @@ Content::technical_summary () const
 DCPTime
 Content::length_after_trim (shared_ptr<const Film> film) const
 {
-	return max (DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position())));
+	DCPTime length = max(DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position())));
+	if (video) {
+		length = length.round(film->video_frame_rate());
+	}
+	return length;
 }
 
 /** @return string which changes when something about this content changes which affects
@@ -315,7 +327,7 @@ Content::identifier () const
 bool
 Content::paths_valid () const
 {
-	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+	for (auto i: _paths) {
 		if (!boost::filesystem::exists (i)) {
 			return false;
 		}
@@ -333,7 +345,7 @@ Content::set_paths (vector<boost::filesystem::path> paths)
 		boost::mutex::scoped_lock lm (_mutex);
 		_paths = paths;
 		_last_write_times.clear ();
-		BOOST_FOREACH (boost::filesystem::path i, _paths) {
+		for (auto i: _paths) {
 			_last_write_times.push_back (boost::filesystem::last_write_time(i));
 		}
 	}
@@ -356,16 +368,16 @@ Content::path_summary () const
 
 /** @return a list of properties that might be interesting to the user */
 list<UserProperty>
-Content::user_properties () const
+Content::user_properties (shared_ptr<const Film> film) const
 {
 	list<UserProperty> p;
-	add_properties (p);
+	add_properties (film, p);
 	return p;
 }
 
 /** @return DCP times of points within this content where a reel split could occur */
 list<DCPTime>
-Content::reel_split_points () const
+Content::reel_split_points (shared_ptr<const Film>) const
 {
 	list<DCPTime> t;
 	/* This is only called for video content and such content has its position forced
@@ -423,7 +435,7 @@ Content::active_video_frame_rate (shared_ptr<const Film> film) const
 }
 
 void
-Content::add_properties (list<UserProperty>& p) const
+Content::add_properties (shared_ptr<const Film>, list<UserProperty>& p) const
 {
 	p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ()));
 
@@ -483,7 +495,7 @@ Content::only_text () const
 shared_ptr<TextContent>
 Content::text_of_original_type (TextType type) const
 {
-	BOOST_FOREACH (shared_ptr<TextContent> i, text) {
+	for (auto i: text) {
 		if (i->original_type() == type) {
 			return i;
 		}