X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=2593c01df2ca7a569cf48f101d55883840dd0bed;hp=5139eb4cc57557a828dc14f58da879baa573cec4;hb=bf0fb7f4f556946c18da151e468f237d9ca96094;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 5139eb4cc..2593c01df 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -52,6 +52,7 @@ using boost::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;
@@ -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 (boost::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);
 	}
 
@@ -270,7 +278,7 @@ Content::set_trim_end (ContentTime t)
 
 
 shared_ptr<Content>
-Content::clone (shared_ptr<const Film> film) const
+Content::clone () const
 {
 	/* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
 	xmlpp::Document doc;
@@ -279,7 +287,7 @@ Content::clone (shared_ptr<const Film> film) const
 
 	/* notes is unused here (we assume) */
 	list<string> notes;
-	return content_factory (film, cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes);
+	return content_factory (cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes);
 }
 
 string
@@ -295,7 +303,7 @@ 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())));
+	return max(DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position()))).round(film->video_frame_rate());
 }
 
 /** @return string which changes when something about this content changes which affects
@@ -356,16 +364,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 +431,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 ()));