X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=efcec534c433ec9b1b36c6903eb4d061504dcb28;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=ca76b01a6c8ad627f851fa7503c2eb9e18eaaa85;hpb=6f856af55898f94b45e3be28aa4f7c962de8a398;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index ca76b01a6..efcec534c 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;
@@ -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