X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=8cb30546371a7c43a19a3afd1529c7941ffbb0c4;hb=c4ac1ba47652884a647103ec49b2de4c0b6e60a9;hp=f78dab17eb3bc495db9e280ef0f54a079b9f5aaf;hpb=d26296467bbf6bd1b2300dd862ce55fcd7f3d624;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index f78dab17e..8cb305463 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -234,6 +234,10 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	optional<double> const ar = d->sample_aspect_ratio ();
 	bool const yuv = d->yuv ();
 
+	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+	ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_size = vs;
@@ -256,10 +260,6 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	if (d->video_frame_rate()) {
 		_parent->set_video_frame_rate (d->video_frame_rate().get());
 	}
-
-	_parent->signal_changed (VideoContentProperty::SIZE);
-	_parent->signal_changed (VideoContentProperty::SCALE);
-	_parent->signal_changed (ContentProperty::LENGTH);
 }
 
 /** @return string which includes everything about how this content looks */
@@ -549,13 +549,13 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 void
 VideoContent::modify_position (DCPTime& pos) const
 {
-	pos = pos.ceil (_parent->film()->video_frame_rate());
+	pos = pos.round (_parent->film()->video_frame_rate());
 }
 
 void
 VideoContent::modify_trim_start (ContentTime& trim) const
 {
 	if (_parent->video_frame_rate()) {
-		trim = trim.ceil (_parent->video_frame_rate().get());
+		trim = trim.round (_parent->video_frame_rate().get());
 	}
 }