X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent.cc;h=4242477d483a06fbfb877d90e8fa74c4f0f5db3c;hb=b639b7b20f1ab341194bcd5c76700ca419254d11;hp=2ca029d5ae321d9b4f8019b4ac2d031383f70192;hpb=aafa1cc676b6bd4d333f0ff3a09e1effabf979c3;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 2ca029d5a..4242477d4 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;
@@ -219,7 +220,13 @@ Content::set_position (shared_ptr<const Film> film, DCPTime p, bool force_emit)
 		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);
 	}
 
@@ -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