More fixes for errors / crashes / misbehaviour with content changes

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5ca48254cd694f40c4cf57d70d85dad3658360cb..81f4138fbef98248cf52aa16a7a8375c7d9a5adc 100644 (file)
--- 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 ();
 
+       ContentChange cc1 (_parent, VideoContentProperty::SIZE);
+       ContentChange cc2 (_parent, VideoContentProperty::SCALE);
+       ContentChange 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 */
@@ -529,26 +529,33 @@ VideoContent::set_fade_out (Frame t)
 }
 
 void
-VideoContent::use_template (shared_ptr<const VideoContent> c)
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
-       _colour_conversion = c->_colour_conversion;
-       _frame_type = c->_frame_type;
-       _crop = c->_crop;
-       _scale = c->_scale;
-       _fade_in = c->_fade_in;
-       _fade_out = c->_fade_out;
+       if (c->_colour_conversion) {
+               set_colour_conversion (c->_colour_conversion.get());
+       } else {
+               unset_colour_conversion ();
+       }
+       set_frame_type (c->_frame_type);
+       set_left_crop (c->_crop.left);
+       set_right_crop (c->_crop.right);
+       set_top_crop (c->_crop.top);
+       set_bottom_crop (c->_crop.bottom);
+       set_scale (c->_scale);
+       set_fade_in (c->_fade_in);
+       set_fade_out (c->_fade_out);
 }
 
 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());
        }
 }